diff --git a/doc/main/BndBuild.html b/doc/main/BndBuild.html
index 4605fcdd4..27216bf0c 100644
--- a/doc/main/BndBuild.html
+++ b/doc/main/BndBuild.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li class="active"><a><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li class="active"><a><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/BuildProperties.html b/doc/main/BuildProperties.html
index e5e793f4b..68f44acea 100644
--- a/doc/main/BuildProperties.html
+++ b/doc/main/BuildProperties.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li class="active"><a><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/Category.html b/doc/main/Category.html
index 8e335e06e..6766177eb 100644
--- a/doc/main/Category.html
+++ b/doc/main/Category.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li class="active"><a><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li class="active"><a><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/PackagingTypes.html b/doc/main/PackagingTypes.html
index 901d9e4a1..b950b6997 100644
--- a/doc/main/PackagingTypes.html
+++ b/doc/main/PackagingTypes.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li class="active"><a><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li class="active"><a><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/StructuredBuild.html b/doc/main/StructuredBuild.html
index ecac3379a..2ad347695 100644
--- a/doc/main/StructuredBuild.html
+++ b/doc/main/StructuredBuild.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li class="active"><a><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/SystemProperties.html b/doc/main/SystemProperties.html
index ff8914126..beee87409 100644
--- a/doc/main/SystemProperties.html
+++ b/doc/main/SystemProperties.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li class="active"><a><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/TargetPlatform.html b/doc/main/TargetPlatform.html
index 9a13ca71c..5b2bdcad6 100644
--- a/doc/main/TargetPlatform.html
+++ b/doc/main/TargetPlatform.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li class="active"><a><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li class="active"><a><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/TestingBundles.html b/doc/main/TestingBundles.html
index ad7a1e24b..6bdd747c6 100644
--- a/doc/main/TestingBundles.html
+++ b/doc/main/TestingBundles.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li class="active"><a><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li class="active"><a><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/TychoCiFriendly.html b/doc/main/TychoCiFriendly.html
index 9c20cfa5e..47b3bd94c 100644
--- a/doc/main/TychoCiFriendly.html
+++ b/doc/main/TychoCiFriendly.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li class="active"><a><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/TychoProperties.html b/doc/main/TychoProperties.html
index 727aa26be..14c3c685b 100644
--- a/doc/main/TychoProperties.html
+++ b/doc/main/TychoProperties.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li class="active"><a><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
   </ul>
diff --git a/doc/main/index.html b/doc/main/index.html
index e85209682..53485c532 100644
--- a/doc/main/index.html
+++ b/doc/main/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li class="active"><a><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li class="active"><a><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/org.eclipse.tycho.surefire.osgibooter/index.html b/doc/main/org.eclipse.tycho.surefire.osgibooter/index.html
index 0d9203873..f5b02755c 100644
--- a/doc/main/org.eclipse.tycho.surefire.osgibooter/index.html
+++ b/doc/main/org.eclipse.tycho.surefire.osgibooter/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/org.eclipse.tycho.surefire.osgibooter/project-info.html b/doc/main/org.eclipse.tycho.surefire.osgibooter/project-info.html
index dd1c545a0..202a1e040 100644
--- a/doc/main/org.eclipse.tycho.surefire.osgibooter/project-info.html
+++ b/doc/main/org.eclipse.tycho.surefire.osgibooter/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/p2-maven-plugin/index.html b/doc/main/p2-maven-plugin/index.html
index f7fd25685..a7e9fd6b5 100644
--- a/doc/main/p2-maven-plugin/index.html
+++ b/doc/main/p2-maven-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/p2-maven-plugin/plugin-info.html b/doc/main/p2-maven-plugin/plugin-info.html
index a55ebd91d..52ac0b24d 100644
--- a/doc/main/p2-maven-plugin/plugin-info.html
+++ b/doc/main/p2-maven-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/p2-maven-plugin/project-info.html b/doc/main/p2-maven-plugin/project-info.html
index 6ad04ac0a..c056d5afa 100644
--- a/doc/main/p2-maven-plugin/project-info.html
+++ b/doc/main/p2-maven-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/p2-maven-plugin/project-reports.html b/doc/main/p2-maven-plugin/project-reports.html
index e4a94346f..b86e949af 100644
--- a/doc/main/p2-maven-plugin/project-reports.html
+++ b/doc/main/p2-maven-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/project-info.html b/doc/main/project-info.html
index 2787a89c8..97fa4144a 100644
--- a/doc/main/project-info.html
+++ b/doc/main/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/index.html b/doc/main/sisu-osgi/index.html
index 324fdc1ca..9ff554ef4 100644
--- a/doc/main/sisu-osgi/index.html
+++ b/doc/main/sisu-osgi/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/project-info.html b/doc/main/sisu-osgi/project-info.html
index 486bf2d2b..953c2e97f 100644
--- a/doc/main/sisu-osgi/project-info.html
+++ b/doc/main/sisu-osgi/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/sisu-equinox-launching/index.html b/doc/main/sisu-osgi/sisu-equinox-launching/index.html
index 7c255dab6..8c095eb97 100644
--- a/doc/main/sisu-osgi/sisu-equinox-launching/index.html
+++ b/doc/main/sisu-osgi/sisu-equinox-launching/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/sisu-equinox-launching/project-info.html b/doc/main/sisu-osgi/sisu-equinox-launching/project-info.html
index ba63e0c92..862b305b1 100644
--- a/doc/main/sisu-osgi/sisu-equinox-launching/project-info.html
+++ b/doc/main/sisu-osgi/sisu-equinox-launching/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/sisu-osgi-api/index.html b/doc/main/sisu-osgi/sisu-osgi-api/index.html
index ea9af216f..404a05c02 100644
--- a/doc/main/sisu-osgi/sisu-osgi-api/index.html
+++ b/doc/main/sisu-osgi/sisu-osgi-api/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/sisu-osgi-api/project-info.html b/doc/main/sisu-osgi/sisu-osgi-api/project-info.html
index a8e3fde73..134143410 100644
--- a/doc/main/sisu-osgi/sisu-osgi-api/project-info.html
+++ b/doc/main/sisu-osgi/sisu-osgi-api/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/sisu-osgi-connect/index.html b/doc/main/sisu-osgi/sisu-osgi-connect/index.html
index 2b79922ae..09b1d190a 100644
--- a/doc/main/sisu-osgi/sisu-osgi-connect/index.html
+++ b/doc/main/sisu-osgi/sisu-osgi-connect/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/sisu-osgi/sisu-osgi-connect/project-info.html b/doc/main/sisu-osgi/sisu-osgi-connect/project-info.html
index 9b302162f..26f42b538 100644
--- a/doc/main/sisu-osgi/sisu-osgi-connect/project-info.html
+++ b/doc/main/sisu-osgi/sisu-osgi-connect/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/target-platform-configuration/index.html b/doc/main/target-platform-configuration/index.html
index 3c6078d35..2f154af11 100644
--- a/doc/main/target-platform-configuration/index.html
+++ b/doc/main/target-platform-configuration/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/target-platform-configuration/mirror-target-platform-mojo.html b/doc/main/target-platform-configuration/mirror-target-platform-mojo.html
index 490ec4f05..1543aa087 100644
--- a/doc/main/target-platform-configuration/mirror-target-platform-mojo.html
+++ b/doc/main/target-platform-configuration/mirror-target-platform-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/target-platform-configuration/plugin-info.html b/doc/main/target-platform-configuration/plugin-info.html
index b2902fa9a..8ca77900a 100644
--- a/doc/main/target-platform-configuration/plugin-info.html
+++ b/doc/main/target-platform-configuration/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/target-platform-configuration/project-info.html b/doc/main/target-platform-configuration/project-info.html
index 22b094511..4eea614fe 100644
--- a/doc/main/target-platform-configuration/project-info.html
+++ b/doc/main/target-platform-configuration/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/target-platform-configuration/project-reports.html b/doc/main/target-platform-configuration/project-reports.html
index 375ddff59..081e44fd0 100644
--- a/doc/main/target-platform-configuration/project-reports.html
+++ b/doc/main/target-platform-configuration/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/target-platform-configuration/target-platform-configuration-mojo.html b/doc/main/target-platform-configuration/target-platform-configuration-mojo.html
index b3ee757e2..96f7857b5 100644
--- a/doc/main/target-platform-configuration/target-platform-configuration-mojo.html
+++ b/doc/main/target-platform-configuration/target-platform-configuration-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/target-platform-configuration/target-platform-mojo.html b/doc/main/target-platform-configuration/target-platform-mojo.html
index 4a02c36d3..5fdfaad7c 100644
--- a/doc/main/target-platform-configuration/target-platform-mojo.html
+++ b/doc/main/target-platform-configuration/target-platform-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-api/index.html b/doc/main/tycho-api/index.html
index d99fccf6e..1757b0edc 100644
--- a/doc/main/tycho-api/index.html
+++ b/doc/main/tycho-api/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-api/project-info.html b/doc/main/tycho-api/project-info.html
index dd0b5e53b..9804479ba 100644
--- a/doc/main/tycho-api/project-info.html
+++ b/doc/main/tycho-api/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-apitools-plugin/generate-mojo.html b/doc/main/tycho-apitools-plugin/generate-mojo.html
index 9488ed44d..37415c1e9 100644
--- a/doc/main/tycho-apitools-plugin/generate-mojo.html
+++ b/doc/main/tycho-apitools-plugin/generate-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-apitools-plugin/index.html b/doc/main/tycho-apitools-plugin/index.html
index 6208d914f..769aa5e25 100644
--- a/doc/main/tycho-apitools-plugin/index.html
+++ b/doc/main/tycho-apitools-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-apitools-plugin/plugin-info.html b/doc/main/tycho-apitools-plugin/plugin-info.html
index 281d75874..35f2c92f5 100644
--- a/doc/main/tycho-apitools-plugin/plugin-info.html
+++ b/doc/main/tycho-apitools-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-apitools-plugin/project-info.html b/doc/main/tycho-apitools-plugin/project-info.html
index cf4ee6ebe..cbf24f654 100644
--- a/doc/main/tycho-apitools-plugin/project-info.html
+++ b/doc/main/tycho-apitools-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-apitools-plugin/project-reports.html b/doc/main/tycho-apitools-plugin/project-reports.html
index 9425e40e4..dd3ee18f7 100644
--- a/doc/main/tycho-apitools-plugin/project-reports.html
+++ b/doc/main/tycho-apitools-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-apitools-plugin/verify-mojo.html b/doc/main/tycho-apitools-plugin/verify-mojo.html
index b5f24c4b8..105e88f13 100644
--- a/doc/main/tycho-apitools-plugin/verify-mojo.html
+++ b/doc/main/tycho-apitools-plugin/verify-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-artifactcomparator/index.html b/doc/main/tycho-artifactcomparator/index.html
index 1089814a3..dbc032009 100644
--- a/doc/main/tycho-artifactcomparator/index.html
+++ b/doc/main/tycho-artifactcomparator/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-artifactcomparator/project-info.html b/doc/main/tycho-artifactcomparator/project-info.html
index 87cbdd6c7..266cbb042 100644
--- a/doc/main/tycho-artifactcomparator/project-info.html
+++ b/doc/main/tycho-artifactcomparator/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-baseline-plugin/index.html b/doc/main/tycho-baseline-plugin/index.html
index 9e9611620..f3d1f4de5 100644
--- a/doc/main/tycho-baseline-plugin/index.html
+++ b/doc/main/tycho-baseline-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-baseline-plugin/plugin-info.html b/doc/main/tycho-baseline-plugin/plugin-info.html
index f72480b3f..cd0c74d62 100644
--- a/doc/main/tycho-baseline-plugin/plugin-info.html
+++ b/doc/main/tycho-baseline-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-baseline-plugin/project-info.html b/doc/main/tycho-baseline-plugin/project-info.html
index 2bfba8591..f32b59c9f 100644
--- a/doc/main/tycho-baseline-plugin/project-info.html
+++ b/doc/main/tycho-baseline-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-baseline-plugin/project-reports.html b/doc/main/tycho-baseline-plugin/project-reports.html
index 93e3ecbed..7d629b5fe 100644
--- a/doc/main/tycho-baseline-plugin/project-reports.html
+++ b/doc/main/tycho-baseline-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-baseline-plugin/verify-mojo.html b/doc/main/tycho-baseline-plugin/verify-mojo.html
index 31f7f40de..4ca648473 100644
--- a/doc/main/tycho-baseline-plugin/verify-mojo.html
+++ b/doc/main/tycho-baseline-plugin/verify-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-bnd-plugin/build-mojo.html b/doc/main/tycho-bnd-plugin/build-mojo.html
index 67d00786d..d206599cb 100644
--- a/doc/main/tycho-bnd-plugin/build-mojo.html
+++ b/doc/main/tycho-bnd-plugin/build-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-bnd-plugin/clean-mojo.html b/doc/main/tycho-bnd-plugin/clean-mojo.html
index c273f10e4..b7a38e7bb 100644
--- a/doc/main/tycho-bnd-plugin/clean-mojo.html
+++ b/doc/main/tycho-bnd-plugin/clean-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-bnd-plugin/compile-mojo.html b/doc/main/tycho-bnd-plugin/compile-mojo.html
index 716a1770f..683302732 100644
--- a/doc/main/tycho-bnd-plugin/compile-mojo.html
+++ b/doc/main/tycho-bnd-plugin/compile-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-bnd-plugin/index.html b/doc/main/tycho-bnd-plugin/index.html
index 997e7c990..aa4e2536b 100644
--- a/doc/main/tycho-bnd-plugin/index.html
+++ b/doc/main/tycho-bnd-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-bnd-plugin/integration-test-mojo.html b/doc/main/tycho-bnd-plugin/integration-test-mojo.html
index 70882a285..c12253ee5 100644
--- a/doc/main/tycho-bnd-plugin/integration-test-mojo.html
+++ b/doc/main/tycho-bnd-plugin/integration-test-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-bnd-plugin/plugin-info.html b/doc/main/tycho-bnd-plugin/plugin-info.html
index 9c1528a3d..e88b65104 100644
--- a/doc/main/tycho-bnd-plugin/plugin-info.html
+++ b/doc/main/tycho-bnd-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-bnd-plugin/process-mojo.html b/doc/main/tycho-bnd-plugin/process-mojo.html
index 77d56041e..d67e663df 100644
--- a/doc/main/tycho-bnd-plugin/process-mojo.html
+++ b/doc/main/tycho-bnd-plugin/process-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-bnd-plugin/project-info.html b/doc/main/tycho-bnd-plugin/project-info.html
index daa6ec441..840817a42 100644
--- a/doc/main/tycho-bnd-plugin/project-info.html
+++ b/doc/main/tycho-bnd-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-bnd-plugin/project-reports.html b/doc/main/tycho-bnd-plugin/project-reports.html
index e30bb65c9..dea3480d5 100644
--- a/doc/main/tycho-bnd-plugin/project-reports.html
+++ b/doc/main/tycho-bnd-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-bnd-plugin/test-compile-mojo.html b/doc/main/tycho-bnd-plugin/test-compile-mojo.html
index ed55df5e8..c0ba449d9 100644
--- a/doc/main/tycho-bnd-plugin/test-compile-mojo.html
+++ b/doc/main/tycho-bnd-plugin/test-compile-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-build/index.html b/doc/main/tycho-build/index.html
index db04e6e2d..23780679b 100644
--- a/doc/main/tycho-build/index.html
+++ b/doc/main/tycho-build/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-build/project-info.html b/doc/main/tycho-build/project-info.html
index 5e1a6e02e..f447773a9 100644
--- a/doc/main/tycho-build/project-info.html
+++ b/doc/main/tycho-build/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-buildtimestamp-jgit/index.html b/doc/main/tycho-buildtimestamp-jgit/index.html
index aa70f1051..186c08d0a 100644
--- a/doc/main/tycho-buildtimestamp-jgit/index.html
+++ b/doc/main/tycho-buildtimestamp-jgit/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-buildtimestamp-jgit/project-info.html b/doc/main/tycho-buildtimestamp-jgit/project-info.html
index 14560a5c7..880e9f30d 100644
--- a/doc/main/tycho-buildtimestamp-jgit/project-info.html
+++ b/doc/main/tycho-buildtimestamp-jgit/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-compiler-jdt/index.html b/doc/main/tycho-compiler-jdt/index.html
index 37258890c..a25ff7456 100644
--- a/doc/main/tycho-compiler-jdt/index.html
+++ b/doc/main/tycho-compiler-jdt/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-compiler-jdt/project-info.html b/doc/main/tycho-compiler-jdt/project-info.html
index 593801665..18aa98d4f 100644
--- a/doc/main/tycho-compiler-jdt/project-info.html
+++ b/doc/main/tycho-compiler-jdt/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-compiler-plugin/compile-mojo.html b/doc/main/tycho-compiler-plugin/compile-mojo.html
index 990190287..cb3a3547b 100644
--- a/doc/main/tycho-compiler-plugin/compile-mojo.html
+++ b/doc/main/tycho-compiler-plugin/compile-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-compiler-plugin/index.html b/doc/main/tycho-compiler-plugin/index.html
index 3cf4328ce..c048c867c 100644
--- a/doc/main/tycho-compiler-plugin/index.html
+++ b/doc/main/tycho-compiler-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-compiler-plugin/plugin-info.html b/doc/main/tycho-compiler-plugin/plugin-info.html
index 554330eae..7ed01dcab 100644
--- a/doc/main/tycho-compiler-plugin/plugin-info.html
+++ b/doc/main/tycho-compiler-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-compiler-plugin/project-info.html b/doc/main/tycho-compiler-plugin/project-info.html
index 843ddf70e..e4d2f710f 100644
--- a/doc/main/tycho-compiler-plugin/project-info.html
+++ b/doc/main/tycho-compiler-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-compiler-plugin/project-reports.html b/doc/main/tycho-compiler-plugin/project-reports.html
index 519e6c250..1542b3ad4 100644
--- a/doc/main/tycho-compiler-plugin/project-reports.html
+++ b/doc/main/tycho-compiler-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-compiler-plugin/testCompile-mojo.html b/doc/main/tycho-compiler-plugin/testCompile-mojo.html
index 1342429a6..7012d4a09 100644
--- a/doc/main/tycho-compiler-plugin/testCompile-mojo.html
+++ b/doc/main/tycho-compiler-plugin/testCompile-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-compiler-plugin/validate-classpath-mojo.html b/doc/main/tycho-compiler-plugin/validate-classpath-mojo.html
index c0177f4e5..f515e948b 100644
--- a/doc/main/tycho-compiler-plugin/validate-classpath-mojo.html
+++ b/doc/main/tycho-compiler-plugin/validate-classpath-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-core/index.html b/doc/main/tycho-core/index.html
index 947b67efb..0c89c9b88 100644
--- a/doc/main/tycho-core/index.html
+++ b/doc/main/tycho-core/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-core/project-info.html b/doc/main/tycho-core/project-info.html
index d745296b9..6b7f20317 100644
--- a/doc/main/tycho-core/project-info.html
+++ b/doc/main/tycho-core/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-ds-plugin/declarative-services-mojo.html b/doc/main/tycho-ds-plugin/declarative-services-mojo.html
index 638686d41..e774cce45 100644
--- a/doc/main/tycho-ds-plugin/declarative-services-mojo.html
+++ b/doc/main/tycho-ds-plugin/declarative-services-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-ds-plugin/index.html b/doc/main/tycho-ds-plugin/index.html
index 619169a2d..d60e9940a 100644
--- a/doc/main/tycho-ds-plugin/index.html
+++ b/doc/main/tycho-ds-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-ds-plugin/plugin-info.html b/doc/main/tycho-ds-plugin/plugin-info.html
index 9dc9cb846..2f739d139 100644
--- a/doc/main/tycho-ds-plugin/plugin-info.html
+++ b/doc/main/tycho-ds-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-ds-plugin/project-info.html b/doc/main/tycho-ds-plugin/project-info.html
index 4b22d5734..f4e9b549c 100644
--- a/doc/main/tycho-ds-plugin/project-info.html
+++ b/doc/main/tycho-ds-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-ds-plugin/project-reports.html b/doc/main/tycho-ds-plugin/project-reports.html
index b4a8221b6..3568b53cf 100644
--- a/doc/main/tycho-ds-plugin/project-reports.html
+++ b/doc/main/tycho-ds-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-eclipse-plugin/eclipse-build-mojo.html b/doc/main/tycho-eclipse-plugin/eclipse-build-mojo.html
index 3ea392ffb..3d48d9ad9 100644
--- a/doc/main/tycho-eclipse-plugin/eclipse-build-mojo.html
+++ b/doc/main/tycho-eclipse-plugin/eclipse-build-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-eclipse-plugin/eclipse-run-mojo.html b/doc/main/tycho-eclipse-plugin/eclipse-run-mojo.html
index 351ba94ef..c9a3c5c31 100644
--- a/doc/main/tycho-eclipse-plugin/eclipse-run-mojo.html
+++ b/doc/main/tycho-eclipse-plugin/eclipse-run-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-eclipse-plugin/index.html b/doc/main/tycho-eclipse-plugin/index.html
index 297e4d5c2..367297731 100644
--- a/doc/main/tycho-eclipse-plugin/index.html
+++ b/doc/main/tycho-eclipse-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-eclipse-plugin/plugin-info.html b/doc/main/tycho-eclipse-plugin/plugin-info.html
index 88d39f287..390c0681e 100644
--- a/doc/main/tycho-eclipse-plugin/plugin-info.html
+++ b/doc/main/tycho-eclipse-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-eclipse-plugin/project-info.html b/doc/main/tycho-eclipse-plugin/project-info.html
index 4791fb585..aa10c696f 100644
--- a/doc/main/tycho-eclipse-plugin/project-info.html
+++ b/doc/main/tycho-eclipse-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-eclipse-plugin/project-reports.html b/doc/main/tycho-eclipse-plugin/project-reports.html
index 83d40b3ef..93576a86b 100644
--- a/doc/main/tycho-eclipse-plugin/project-reports.html
+++ b/doc/main/tycho-eclipse-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/index.html b/doc/main/tycho-extras/index.html
index 333fcb126..97a5fc6c2 100644
--- a/doc/main/tycho-extras/index.html
+++ b/doc/main/tycho-extras/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/project-info.html b/doc/main/tycho-extras/project-info.html
index 6e20d64c8..3768672c1 100644
--- a/doc/main/tycho-extras/project-info.html
+++ b/doc/main/tycho-extras/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/target-platform-validation-plugin/index.html b/doc/main/tycho-extras/target-platform-validation-plugin/index.html
index 33c76ed04..b4d12a8f4 100644
--- a/doc/main/tycho-extras/target-platform-validation-plugin/index.html
+++ b/doc/main/tycho-extras/target-platform-validation-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/target-platform-validation-plugin/plugin-info.html b/doc/main/tycho-extras/target-platform-validation-plugin/plugin-info.html
index a2a4a384a..5c93f2368 100644
--- a/doc/main/tycho-extras/target-platform-validation-plugin/plugin-info.html
+++ b/doc/main/tycho-extras/target-platform-validation-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/target-platform-validation-plugin/project-info.html b/doc/main/tycho-extras/target-platform-validation-plugin/project-info.html
index 5ce73907c..6fead3e3e 100644
--- a/doc/main/tycho-extras/target-platform-validation-plugin/project-info.html
+++ b/doc/main/tycho-extras/target-platform-validation-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/target-platform-validation-plugin/project-reports.html b/doc/main/tycho-extras/target-platform-validation-plugin/project-reports.html
index 07fa78937..701ef09f8 100644
--- a/doc/main/tycho-extras/target-platform-validation-plugin/project-reports.html
+++ b/doc/main/tycho-extras/target-platform-validation-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/target-platform-validation-plugin/validate-target-platform-mojo.html b/doc/main/tycho-extras/target-platform-validation-plugin/validate-target-platform-mojo.html
index 9c96b10ce..dee0356c2 100644
--- a/doc/main/tycho-extras/target-platform-validation-plugin/validate-target-platform-mojo.html
+++ b/doc/main/tycho-extras/target-platform-validation-plugin/validate-target-platform-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-custom-bundle-plugin/custom-bundle-mojo.html b/doc/main/tycho-extras/tycho-custom-bundle-plugin/custom-bundle-mojo.html
index 22f528ee1..72f234b84 100644
--- a/doc/main/tycho-extras/tycho-custom-bundle-plugin/custom-bundle-mojo.html
+++ b/doc/main/tycho-extras/tycho-custom-bundle-plugin/custom-bundle-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-custom-bundle-plugin/index.html b/doc/main/tycho-extras/tycho-custom-bundle-plugin/index.html
index f332ba510..26f517768 100644
--- a/doc/main/tycho-extras/tycho-custom-bundle-plugin/index.html
+++ b/doc/main/tycho-extras/tycho-custom-bundle-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-custom-bundle-plugin/plugin-info.html b/doc/main/tycho-extras/tycho-custom-bundle-plugin/plugin-info.html
index c11301c1a..5c30672af 100644
--- a/doc/main/tycho-extras/tycho-custom-bundle-plugin/plugin-info.html
+++ b/doc/main/tycho-extras/tycho-custom-bundle-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-info.html b/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-info.html
index ba637476e..b1eecb69c 100644
--- a/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-info.html
+++ b/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-reports.html b/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-reports.html
index f657f2dc8..097b0d713 100644
--- a/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-reports.html
+++ b/doc/main/tycho-extras/tycho-custom-bundle-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-dependency-tools-plugin/index.html b/doc/main/tycho-extras/tycho-dependency-tools-plugin/index.html
index a15c7a826..8de7145ad 100644
--- a/doc/main/tycho-extras/tycho-dependency-tools-plugin/index.html
+++ b/doc/main/tycho-extras/tycho-dependency-tools-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-dependency-tools-plugin/list-dependencies-mojo.html b/doc/main/tycho-extras/tycho-dependency-tools-plugin/list-dependencies-mojo.html
index aaa412751..40c47e6b7 100644
--- a/doc/main/tycho-extras/tycho-dependency-tools-plugin/list-dependencies-mojo.html
+++ b/doc/main/tycho-extras/tycho-dependency-tools-plugin/list-dependencies-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-dependency-tools-plugin/plugin-info.html b/doc/main/tycho-extras/tycho-dependency-tools-plugin/plugin-info.html
index 5af269ee3..722ffeed7 100644
--- a/doc/main/tycho-extras/tycho-dependency-tools-plugin/plugin-info.html
+++ b/doc/main/tycho-extras/tycho-dependency-tools-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-info.html b/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-info.html
index f3ae170b8..e31e1ae58 100644
--- a/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-info.html
+++ b/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-reports.html b/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-reports.html
index 4eb99671f..006f53a92 100644
--- a/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-reports.html
+++ b/doc/main/tycho-extras/tycho-dependency-tools-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/build-help-index-mojo.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/build-help-index-mojo.html
index e3e2572f4..be27a10cb 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/build-help-index-mojo.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/build-help-index-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/configure-document-bundle-plugin-mojo.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/configure-document-bundle-plugin-mojo.html
index 0124b76fd..07adbfeb2 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/configure-document-bundle-plugin-mojo.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/configure-document-bundle-plugin-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/index.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/index.html
index ff56ebe2f..d3547d6c2 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/index.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/javadoc-mojo.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/javadoc-mojo.html
index 4d05adf97..fcb2088ae 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/javadoc-mojo.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/javadoc-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/plugin-info.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/plugin-info.html
index 8d4892e1b..341eb1efa 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/plugin-info.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/project-info.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/project-info.html
index 71f0859cf..967380373 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/project-info.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/project-reports.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/project-reports.html
index 50e95f6ef..27d9de550 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/project-reports.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-document-bundle-plugin/schema-to-html-mojo.html b/doc/main/tycho-extras/tycho-document-bundle-plugin/schema-to-html-mojo.html
index 7c219408e..0025b6ae5 100644
--- a/doc/main/tycho-extras/tycho-document-bundle-plugin/schema-to-html-mojo.html
+++ b/doc/main/tycho-extras/tycho-document-bundle-plugin/schema-to-html-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-p2-extras-plugin/compare-version-with-baselines-mojo.html b/doc/main/tycho-extras/tycho-p2-extras-plugin/compare-version-with-baselines-mojo.html
index aea1a824b..a50b0c02b 100644
--- a/doc/main/tycho-extras/tycho-p2-extras-plugin/compare-version-with-baselines-mojo.html
+++ b/doc/main/tycho-extras/tycho-p2-extras-plugin/compare-version-with-baselines-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-p2-extras-plugin/index.html b/doc/main/tycho-extras/tycho-p2-extras-plugin/index.html
index 179acedac..5426f6b34 100644
--- a/doc/main/tycho-extras/tycho-p2-extras-plugin/index.html
+++ b/doc/main/tycho-extras/tycho-p2-extras-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-p2-extras-plugin/mirror-mojo.html b/doc/main/tycho-extras/tycho-p2-extras-plugin/mirror-mojo.html
index dcb61869f..05b665810 100644
--- a/doc/main/tycho-extras/tycho-p2-extras-plugin/mirror-mojo.html
+++ b/doc/main/tycho-extras/tycho-p2-extras-plugin/mirror-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-p2-extras-plugin/plugin-info.html b/doc/main/tycho-extras/tycho-p2-extras-plugin/plugin-info.html
index 806b7bfd1..4f6efbf55 100644
--- a/doc/main/tycho-extras/tycho-p2-extras-plugin/plugin-info.html
+++ b/doc/main/tycho-extras/tycho-p2-extras-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-p2-extras-plugin/project-info.html b/doc/main/tycho-extras/tycho-p2-extras-plugin/project-info.html
index 321e031dd..af58f1bbd 100644
--- a/doc/main/tycho-extras/tycho-p2-extras-plugin/project-info.html
+++ b/doc/main/tycho-extras/tycho-p2-extras-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-p2-extras-plugin/project-reports.html b/doc/main/tycho-extras/tycho-p2-extras-plugin/project-reports.html
index ce2597927..04d177858 100644
--- a/doc/main/tycho-extras/tycho-p2-extras-plugin/project-reports.html
+++ b/doc/main/tycho-extras/tycho-p2-extras-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-p2-extras-plugin/publish-features-and-bundles-mojo.html b/doc/main/tycho-extras/tycho-p2-extras-plugin/publish-features-and-bundles-mojo.html
index d0df91f4b..60cbefd76 100644
--- a/doc/main/tycho-extras/tycho-p2-extras-plugin/publish-features-and-bundles-mojo.html
+++ b/doc/main/tycho-extras/tycho-p2-extras-plugin/publish-features-and-bundles-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-pomless/index.html b/doc/main/tycho-extras/tycho-pomless/index.html
index 82e27b532..ef85f9fb7 100644
--- a/doc/main/tycho-extras/tycho-pomless/index.html
+++ b/doc/main/tycho-extras/tycho-pomless/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-pomless/project-info.html b/doc/main/tycho-extras/tycho-pomless/project-info.html
index e6b585ccc..6d0f22e80 100644
--- a/doc/main/tycho-extras/tycho-pomless/project-info.html
+++ b/doc/main/tycho-extras/tycho-pomless/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-sourceref-jgit/index.html b/doc/main/tycho-extras/tycho-sourceref-jgit/index.html
index c764f4186..4f7944424 100644
--- a/doc/main/tycho-extras/tycho-sourceref-jgit/index.html
+++ b/doc/main/tycho-extras/tycho-sourceref-jgit/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-sourceref-jgit/project-info.html b/doc/main/tycho-extras/tycho-sourceref-jgit/project-info.html
index dd188c2fd..c65ac2744 100644
--- a/doc/main/tycho-extras/tycho-sourceref-jgit/project-info.html
+++ b/doc/main/tycho-extras/tycho-sourceref-jgit/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-version-bump-plugin/index.html b/doc/main/tycho-extras/tycho-version-bump-plugin/index.html
index 202232994..1d21ff7bf 100644
--- a/doc/main/tycho-extras/tycho-version-bump-plugin/index.html
+++ b/doc/main/tycho-extras/tycho-version-bump-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-version-bump-plugin/plugin-info.html b/doc/main/tycho-extras/tycho-version-bump-plugin/plugin-info.html
index 4b6262bfc..f193e814f 100644
--- a/doc/main/tycho-extras/tycho-version-bump-plugin/plugin-info.html
+++ b/doc/main/tycho-extras/tycho-version-bump-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-version-bump-plugin/project-info.html b/doc/main/tycho-extras/tycho-version-bump-plugin/project-info.html
index 16e4fb062..66284c280 100644
--- a/doc/main/tycho-extras/tycho-version-bump-plugin/project-info.html
+++ b/doc/main/tycho-extras/tycho-version-bump-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-extras/tycho-version-bump-plugin/project-reports.html b/doc/main/tycho-extras/tycho-version-bump-plugin/project-reports.html
index 4450ca40d..d5052c1dc 100644
--- a/doc/main/tycho-extras/tycho-version-bump-plugin/project-reports.html
+++ b/doc/main/tycho-extras/tycho-version-bump-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-extras/tycho-version-bump-plugin/update-product-mojo.html b/doc/main/tycho-extras/tycho-version-bump-plugin/update-product-mojo.html
index b14002143..298b79416 100644
--- a/doc/main/tycho-extras/tycho-version-bump-plugin/update-product-mojo.html
+++ b/doc/main/tycho-extras/tycho-version-bump-plugin/update-product-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-extras/tycho-version-bump-plugin/update-target-mojo.html b/doc/main/tycho-extras/tycho-version-bump-plugin/update-target-mojo.html
index b47c22ecf..04693fe52 100644
--- a/doc/main/tycho-extras/tycho-version-bump-plugin/update-target-mojo.html
+++ b/doc/main/tycho-extras/tycho-version-bump-plugin/update-target-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-gpg-plugin/index.html b/doc/main/tycho-gpg-plugin/index.html
index 02dbc8cdd..56d2e9bbe 100644
--- a/doc/main/tycho-gpg-plugin/index.html
+++ b/doc/main/tycho-gpg-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-gpg-plugin/plugin-info.html b/doc/main/tycho-gpg-plugin/plugin-info.html
index be68b5140..094f2513e 100644
--- a/doc/main/tycho-gpg-plugin/plugin-info.html
+++ b/doc/main/tycho-gpg-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-gpg-plugin/project-info.html b/doc/main/tycho-gpg-plugin/project-info.html
index a871c9162..e449511b0 100644
--- a/doc/main/tycho-gpg-plugin/project-info.html
+++ b/doc/main/tycho-gpg-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-gpg-plugin/project-reports.html b/doc/main/tycho-gpg-plugin/project-reports.html
index 71c0c047a..8d502e895 100644
--- a/doc/main/tycho-gpg-plugin/project-reports.html
+++ b/doc/main/tycho-gpg-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-gpg-plugin/sign-p2-artifacts-mojo.html b/doc/main/tycho-gpg-plugin/sign-p2-artifacts-mojo.html
index 91d82f0a4..a423ae990 100644
--- a/doc/main/tycho-gpg-plugin/sign-p2-artifacts-mojo.html
+++ b/doc/main/tycho-gpg-plugin/sign-p2-artifacts-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-lib-detector/index.html b/doc/main/tycho-lib-detector/index.html
index 466b80da7..9c931808b 100644
--- a/doc/main/tycho-lib-detector/index.html
+++ b/doc/main/tycho-lib-detector/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-lib-detector/project-info.html b/doc/main/tycho-lib-detector/project-info.html
index 00cec6de4..4ebcbe1a8 100644
--- a/doc/main/tycho-lib-detector/project-info.html
+++ b/doc/main/tycho-lib-detector/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-maven-plugin/index.html b/doc/main/tycho-maven-plugin/index.html
index dd2f455fb..d9f742d42 100644
--- a/doc/main/tycho-maven-plugin/index.html
+++ b/doc/main/tycho-maven-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-maven-plugin/plugin-info.html b/doc/main/tycho-maven-plugin/plugin-info.html
index 3666e192c..b2420485a 100644
--- a/doc/main/tycho-maven-plugin/plugin-info.html
+++ b/doc/main/tycho-maven-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-maven-plugin/project-info.html b/doc/main/tycho-maven-plugin/project-info.html
index d6338c172..246792eb6 100644
--- a/doc/main/tycho-maven-plugin/project-info.html
+++ b/doc/main/tycho-maven-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-maven-plugin/project-reports.html b/doc/main/tycho-maven-plugin/project-reports.html
index 8468f0066..db7a1997f 100644
--- a/doc/main/tycho-maven-plugin/project-reports.html
+++ b/doc/main/tycho-maven-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-metadata-model/index.html b/doc/main/tycho-metadata-model/index.html
index a9eb366a7..f74d43a8b 100644
--- a/doc/main/tycho-metadata-model/index.html
+++ b/doc/main/tycho-metadata-model/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-metadata-model/project-info.html b/doc/main/tycho-metadata-model/project-info.html
index de208ba30..d38932902 100644
--- a/doc/main/tycho-metadata-model/project-info.html
+++ b/doc/main/tycho-metadata-model/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-director-plugin/archive-products-mojo.html b/doc/main/tycho-p2-director-plugin/archive-products-mojo.html
index 902135ae8..86a7782b8 100644
--- a/doc/main/tycho-p2-director-plugin/archive-products-mojo.html
+++ b/doc/main/tycho-p2-director-plugin/archive-products-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-director-plugin/director-mojo.html b/doc/main/tycho-p2-director-plugin/director-mojo.html
index ec4e10f0f..39a674bf6 100644
--- a/doc/main/tycho-p2-director-plugin/director-mojo.html
+++ b/doc/main/tycho-p2-director-plugin/director-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-director-plugin/index.html b/doc/main/tycho-p2-director-plugin/index.html
index 975af282d..7b29f4abf 100644
--- a/doc/main/tycho-p2-director-plugin/index.html
+++ b/doc/main/tycho-p2-director-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-director-plugin/materialize-products-mojo.html b/doc/main/tycho-p2-director-plugin/materialize-products-mojo.html
index 79188bb2b..850f92fe2 100644
--- a/doc/main/tycho-p2-director-plugin/materialize-products-mojo.html
+++ b/doc/main/tycho-p2-director-plugin/materialize-products-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-director-plugin/plugin-info.html b/doc/main/tycho-p2-director-plugin/plugin-info.html
index 1bca8b3b8..477dde995 100644
--- a/doc/main/tycho-p2-director-plugin/plugin-info.html
+++ b/doc/main/tycho-p2-director-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-director-plugin/project-info.html b/doc/main/tycho-p2-director-plugin/project-info.html
index 726d5eac9..b1510d68e 100644
--- a/doc/main/tycho-p2-director-plugin/project-info.html
+++ b/doc/main/tycho-p2-director-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-director-plugin/project-reports.html b/doc/main/tycho-p2-director-plugin/project-reports.html
index 58473a591..ef498204a 100644
--- a/doc/main/tycho-p2-director-plugin/project-reports.html
+++ b/doc/main/tycho-p2-director-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-plugin/category-p2-metadata-mojo.html b/doc/main/tycho-p2-plugin/category-p2-metadata-mojo.html
index 94a77bd6d..b1c492177 100644
--- a/doc/main/tycho-p2-plugin/category-p2-metadata-mojo.html
+++ b/doc/main/tycho-p2-plugin/category-p2-metadata-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-plugin/dependency-tree-mojo.html b/doc/main/tycho-p2-plugin/dependency-tree-mojo.html
index acc7da659..b6f2f7b56 100644
--- a/doc/main/tycho-p2-plugin/dependency-tree-mojo.html
+++ b/doc/main/tycho-p2-plugin/dependency-tree-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-plugin/feature-p2-metadata-mojo.html b/doc/main/tycho-p2-plugin/feature-p2-metadata-mojo.html
index 78d53ae1f..89da223b0 100644
--- a/doc/main/tycho-p2-plugin/feature-p2-metadata-mojo.html
+++ b/doc/main/tycho-p2-plugin/feature-p2-metadata-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-plugin/index.html b/doc/main/tycho-p2-plugin/index.html
index 6bb998497..9b132cf6e 100644
--- a/doc/main/tycho-p2-plugin/index.html
+++ b/doc/main/tycho-p2-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-plugin/p2-metadata-default-mojo.html b/doc/main/tycho-p2-plugin/p2-metadata-default-mojo.html
index 11d9b5b76..bd50238e7 100644
--- a/doc/main/tycho-p2-plugin/p2-metadata-default-mojo.html
+++ b/doc/main/tycho-p2-plugin/p2-metadata-default-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-plugin/p2-metadata-mojo.html b/doc/main/tycho-p2-plugin/p2-metadata-mojo.html
index 5212a8cb6..7b8724798 100644
--- a/doc/main/tycho-p2-plugin/p2-metadata-mojo.html
+++ b/doc/main/tycho-p2-plugin/p2-metadata-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-plugin/plugin-info.html b/doc/main/tycho-p2-plugin/plugin-info.html
index 0b4882889..f55128165 100644
--- a/doc/main/tycho-p2-plugin/plugin-info.html
+++ b/doc/main/tycho-p2-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-plugin/project-info.html b/doc/main/tycho-p2-plugin/project-info.html
index dbb712b6f..0b48921c3 100644
--- a/doc/main/tycho-p2-plugin/project-info.html
+++ b/doc/main/tycho-p2-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-plugin/project-reports.html b/doc/main/tycho-p2-plugin/project-reports.html
index a06b01076..f37116bdc 100644
--- a/doc/main/tycho-p2-plugin/project-reports.html
+++ b/doc/main/tycho-p2-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-plugin/update-local-index-mojo.html b/doc/main/tycho-p2-plugin/update-local-index-mojo.html
index 53610ed56..d7470ed9f 100644
--- a/doc/main/tycho-p2-plugin/update-local-index-mojo.html
+++ b/doc/main/tycho-p2-plugin/update-local-index-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-plugin/update-site-p2-metadata-mojo.html b/doc/main/tycho-p2-plugin/update-site-p2-metadata-mojo.html
index 3d7cd86d5..67f0345d4 100644
--- a/doc/main/tycho-p2-plugin/update-site-p2-metadata-mojo.html
+++ b/doc/main/tycho-p2-plugin/update-site-p2-metadata-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-publisher-plugin/attach-artifacts-mojo.html b/doc/main/tycho-p2-publisher-plugin/attach-artifacts-mojo.html
index d3334aa9a..63a709852 100644
--- a/doc/main/tycho-p2-publisher-plugin/attach-artifacts-mojo.html
+++ b/doc/main/tycho-p2-publisher-plugin/attach-artifacts-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-publisher-plugin/index.html b/doc/main/tycho-p2-publisher-plugin/index.html
index b387ef652..135c5c67d 100644
--- a/doc/main/tycho-p2-publisher-plugin/index.html
+++ b/doc/main/tycho-p2-publisher-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-publisher-plugin/plugin-info.html b/doc/main/tycho-p2-publisher-plugin/plugin-info.html
index 1c6e15325..33b1ce63f 100644
--- a/doc/main/tycho-p2-publisher-plugin/plugin-info.html
+++ b/doc/main/tycho-p2-publisher-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-publisher-plugin/project-info.html b/doc/main/tycho-p2-publisher-plugin/project-info.html
index 60bb27e31..bcc06dcbb 100644
--- a/doc/main/tycho-p2-publisher-plugin/project-info.html
+++ b/doc/main/tycho-p2-publisher-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-publisher-plugin/project-reports.html b/doc/main/tycho-p2-publisher-plugin/project-reports.html
index 6fc5caf53..d5ce94ec6 100644
--- a/doc/main/tycho-p2-publisher-plugin/project-reports.html
+++ b/doc/main/tycho-p2-publisher-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-publisher-plugin/publish-categories-mojo.html b/doc/main/tycho-p2-publisher-plugin/publish-categories-mojo.html
index bead52970..5b2bad2d0 100644
--- a/doc/main/tycho-p2-publisher-plugin/publish-categories-mojo.html
+++ b/doc/main/tycho-p2-publisher-plugin/publish-categories-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-publisher-plugin/publish-ee-profile-mojo.html b/doc/main/tycho-p2-publisher-plugin/publish-ee-profile-mojo.html
index 22c1ca884..c26d8ad4e 100644
--- a/doc/main/tycho-p2-publisher-plugin/publish-ee-profile-mojo.html
+++ b/doc/main/tycho-p2-publisher-plugin/publish-ee-profile-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-publisher-plugin/publish-osgi-ee-mojo.html b/doc/main/tycho-p2-publisher-plugin/publish-osgi-ee-mojo.html
index 2f91a5a7a..dcb561b52 100644
--- a/doc/main/tycho-p2-publisher-plugin/publish-osgi-ee-mojo.html
+++ b/doc/main/tycho-p2-publisher-plugin/publish-osgi-ee-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-publisher-plugin/publish-products-mojo.html b/doc/main/tycho-p2-publisher-plugin/publish-products-mojo.html
index 8c989ce58..130715fb4 100644
--- a/doc/main/tycho-p2-publisher-plugin/publish-products-mojo.html
+++ b/doc/main/tycho-p2-publisher-plugin/publish-products-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-repository-plugin/archive-repository-mojo.html b/doc/main/tycho-p2-repository-plugin/archive-repository-mojo.html
index fcc14afd5..684100b81 100644
--- a/doc/main/tycho-p2-repository-plugin/archive-repository-mojo.html
+++ b/doc/main/tycho-p2-repository-plugin/archive-repository-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-repository-plugin/assemble-maven-repository-mojo.html b/doc/main/tycho-p2-repository-plugin/assemble-maven-repository-mojo.html
index 8d55b8b32..b6051daa1 100644
--- a/doc/main/tycho-p2-repository-plugin/assemble-maven-repository-mojo.html
+++ b/doc/main/tycho-p2-repository-plugin/assemble-maven-repository-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-repository-plugin/assemble-repository-mojo.html b/doc/main/tycho-p2-repository-plugin/assemble-repository-mojo.html
index 8a8257a33..d47f8e76f 100644
--- a/doc/main/tycho-p2-repository-plugin/assemble-repository-mojo.html
+++ b/doc/main/tycho-p2-repository-plugin/assemble-repository-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-repository-plugin/fix-artifacts-metadata-mojo.html b/doc/main/tycho-p2-repository-plugin/fix-artifacts-metadata-mojo.html
index 690744947..7d2204ac8 100644
--- a/doc/main/tycho-p2-repository-plugin/fix-artifacts-metadata-mojo.html
+++ b/doc/main/tycho-p2-repository-plugin/fix-artifacts-metadata-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-repository-plugin/index.html b/doc/main/tycho-p2-repository-plugin/index.html
index f3b1b0eed..c7a99a87b 100644
--- a/doc/main/tycho-p2-repository-plugin/index.html
+++ b/doc/main/tycho-p2-repository-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-repository-plugin/plugin-info.html b/doc/main/tycho-p2-repository-plugin/plugin-info.html
index c507a3edf..f098b9c5e 100644
--- a/doc/main/tycho-p2-repository-plugin/plugin-info.html
+++ b/doc/main/tycho-p2-repository-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-repository-plugin/project-info.html b/doc/main/tycho-p2-repository-plugin/project-info.html
index 8d171d0b2..3646b0bc2 100644
--- a/doc/main/tycho-p2-repository-plugin/project-info.html
+++ b/doc/main/tycho-p2-repository-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2-repository-plugin/project-reports.html b/doc/main/tycho-p2-repository-plugin/project-reports.html
index a129025c6..583f7c305 100644
--- a/doc/main/tycho-p2-repository-plugin/project-reports.html
+++ b/doc/main/tycho-p2-repository-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-p2-repository-plugin/remap-artifacts-to-m2-repo-mojo.html b/doc/main/tycho-p2-repository-plugin/remap-artifacts-to-m2-repo-mojo.html
index cfd48b584..67d74c330 100644
--- a/doc/main/tycho-p2-repository-plugin/remap-artifacts-to-m2-repo-mojo.html
+++ b/doc/main/tycho-p2-repository-plugin/remap-artifacts-to-m2-repo-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-repository-plugin/repo-to-runnable-mojo.html b/doc/main/tycho-p2-repository-plugin/repo-to-runnable-mojo.html
index b182522ad..b188c6ddb 100644
--- a/doc/main/tycho-p2-repository-plugin/repo-to-runnable-mojo.html
+++ b/doc/main/tycho-p2-repository-plugin/repo-to-runnable-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2-repository-plugin/verify-repository-mojo.html b/doc/main/tycho-p2-repository-plugin/verify-repository-mojo.html
index abdeb2a45..c01fce322 100644
--- a/doc/main/tycho-p2-repository-plugin/verify-repository-mojo.html
+++ b/doc/main/tycho-p2-repository-plugin/verify-repository-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-p2/index.html b/doc/main/tycho-p2/index.html
index 0cf80db0d..074b10100 100644
--- a/doc/main/tycho-p2/index.html
+++ b/doc/main/tycho-p2/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-p2/project-info.html b/doc/main/tycho-p2/project-info.html
index dac489199..fce9318a8 100644
--- a/doc/main/tycho-p2/project-info.html
+++ b/doc/main/tycho-p2/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-packaging-plugin/build-qualifier-aggregator-mojo.html b/doc/main/tycho-packaging-plugin/build-qualifier-aggregator-mojo.html
index 87832e18c..b1f78abb2 100644
--- a/doc/main/tycho-packaging-plugin/build-qualifier-aggregator-mojo.html
+++ b/doc/main/tycho-packaging-plugin/build-qualifier-aggregator-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/build-qualifier-mojo.html b/doc/main/tycho-packaging-plugin/build-qualifier-mojo.html
index fbb8a8997..82ea880b2 100644
--- a/doc/main/tycho-packaging-plugin/build-qualifier-mojo.html
+++ b/doc/main/tycho-packaging-plugin/build-qualifier-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/index.html b/doc/main/tycho-packaging-plugin/index.html
index ef9cd042a..8574646de 100644
--- a/doc/main/tycho-packaging-plugin/index.html
+++ b/doc/main/tycho-packaging-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-packaging-plugin/package-feature-mojo.html b/doc/main/tycho-packaging-plugin/package-feature-mojo.html
index 0c7c64f66..3219b271b 100644
--- a/doc/main/tycho-packaging-plugin/package-feature-mojo.html
+++ b/doc/main/tycho-packaging-plugin/package-feature-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/package-iu-mojo.html b/doc/main/tycho-packaging-plugin/package-iu-mojo.html
index d49f6adc4..cf73bea51 100644
--- a/doc/main/tycho-packaging-plugin/package-iu-mojo.html
+++ b/doc/main/tycho-packaging-plugin/package-iu-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/package-plugin-mojo.html b/doc/main/tycho-packaging-plugin/package-plugin-mojo.html
index b4b9d9929..f4facc354 100644
--- a/doc/main/tycho-packaging-plugin/package-plugin-mojo.html
+++ b/doc/main/tycho-packaging-plugin/package-plugin-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/package-target-definition-mojo.html b/doc/main/tycho-packaging-plugin/package-target-definition-mojo.html
index e58efefeb..3debeac0b 100644
--- a/doc/main/tycho-packaging-plugin/package-target-definition-mojo.html
+++ b/doc/main/tycho-packaging-plugin/package-target-definition-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/plugin-info.html b/doc/main/tycho-packaging-plugin/plugin-info.html
index 1b0fd0c33..5b4fe22a5 100644
--- a/doc/main/tycho-packaging-plugin/plugin-info.html
+++ b/doc/main/tycho-packaging-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-packaging-plugin/project-info.html b/doc/main/tycho-packaging-plugin/project-info.html
index 047fb0edc..bbd90344e 100644
--- a/doc/main/tycho-packaging-plugin/project-info.html
+++ b/doc/main/tycho-packaging-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-packaging-plugin/project-reports.html b/doc/main/tycho-packaging-plugin/project-reports.html
index 6e10efe7d..d9def1819 100644
--- a/doc/main/tycho-packaging-plugin/project-reports.html
+++ b/doc/main/tycho-packaging-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-packaging-plugin/update-consumer-pom-mojo.html b/doc/main/tycho-packaging-plugin/update-consumer-pom-mojo.html
index 37926f6dc..1fbd9ea46 100644
--- a/doc/main/tycho-packaging-plugin/update-consumer-pom-mojo.html
+++ b/doc/main/tycho-packaging-plugin/update-consumer-pom-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/validate-id-mojo.html b/doc/main/tycho-packaging-plugin/validate-id-mojo.html
index a0404db3f..65f6dc109 100644
--- a/doc/main/tycho-packaging-plugin/validate-id-mojo.html
+++ b/doc/main/tycho-packaging-plugin/validate-id-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/validate-version-mojo.html b/doc/main/tycho-packaging-plugin/validate-version-mojo.html
index 0324495bb..496ce712e 100644
--- a/doc/main/tycho-packaging-plugin/validate-version-mojo.html
+++ b/doc/main/tycho-packaging-plugin/validate-version-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-packaging-plugin/verify-osgi-pom-mojo.html b/doc/main/tycho-packaging-plugin/verify-osgi-pom-mojo.html
index b8a715cb6..c05d1777c 100644
--- a/doc/main/tycho-packaging-plugin/verify-osgi-pom-mojo.html
+++ b/doc/main/tycho-packaging-plugin/verify-osgi-pom-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-repository-plugin/index.html b/doc/main/tycho-repository-plugin/index.html
index 207b0e6d8..46199e1af 100644
--- a/doc/main/tycho-repository-plugin/index.html
+++ b/doc/main/tycho-repository-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-repository-plugin/package-repository-mojo.html b/doc/main/tycho-repository-plugin/package-repository-mojo.html
index 9660b9458..02c3ec2a5 100644
--- a/doc/main/tycho-repository-plugin/package-repository-mojo.html
+++ b/doc/main/tycho-repository-plugin/package-repository-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-repository-plugin/plugin-info.html b/doc/main/tycho-repository-plugin/plugin-info.html
index 6c0ce5b4f..c393ac238 100644
--- a/doc/main/tycho-repository-plugin/plugin-info.html
+++ b/doc/main/tycho-repository-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-repository-plugin/project-info.html b/doc/main/tycho-repository-plugin/project-info.html
index ebbf8e61b..b219a44f6 100644
--- a/doc/main/tycho-repository-plugin/project-info.html
+++ b/doc/main/tycho-repository-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-repository-plugin/project-reports.html b/doc/main/tycho-repository-plugin/project-reports.html
index 36fc0f406..94603ec85 100644
--- a/doc/main/tycho-repository-plugin/project-reports.html
+++ b/doc/main/tycho-repository-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-source-plugin/feature-source-mojo.html b/doc/main/tycho-source-plugin/feature-source-mojo.html
index 26fb5ff01..ec76375b4 100644
--- a/doc/main/tycho-source-plugin/feature-source-mojo.html
+++ b/doc/main/tycho-source-plugin/feature-source-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-source-plugin/generate-pde-source-header-mojo.html b/doc/main/tycho-source-plugin/generate-pde-source-header-mojo.html
index 74e40571a..d6fc6a241 100644
--- a/doc/main/tycho-source-plugin/generate-pde-source-header-mojo.html
+++ b/doc/main/tycho-source-plugin/generate-pde-source-header-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-source-plugin/index.html b/doc/main/tycho-source-plugin/index.html
index af36a6298..fd879ffe2 100644
--- a/doc/main/tycho-source-plugin/index.html
+++ b/doc/main/tycho-source-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-source-plugin/plugin-info.html b/doc/main/tycho-source-plugin/plugin-info.html
index b229262a2..65fcf25e6 100644
--- a/doc/main/tycho-source-plugin/plugin-info.html
+++ b/doc/main/tycho-source-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-source-plugin/plugin-source-mojo.html b/doc/main/tycho-source-plugin/plugin-source-mojo.html
index 7581d136a..ff1d81a16 100644
--- a/doc/main/tycho-source-plugin/plugin-source-mojo.html
+++ b/doc/main/tycho-source-plugin/plugin-source-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-source-plugin/project-info.html b/doc/main/tycho-source-plugin/project-info.html
index 02c2b1ccb..d7f8715b2 100644
--- a/doc/main/tycho-source-plugin/project-info.html
+++ b/doc/main/tycho-source-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-source-plugin/project-reports.html b/doc/main/tycho-source-plugin/project-reports.html
index cda4c930e..915a0cc19 100644
--- a/doc/main/tycho-source-plugin/project-reports.html
+++ b/doc/main/tycho-source-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-spi/index.html b/doc/main/tycho-spi/index.html
index a8d07091a..6428a3622 100644
--- a/doc/main/tycho-spi/index.html
+++ b/doc/main/tycho-spi/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-spi/project-info.html b/doc/main/tycho-spi/project-info.html
index 4c93393c0..199056a7e 100644
--- a/doc/main/tycho-spi/project-info.html
+++ b/doc/main/tycho-spi/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire-plugin/bnd-test-mojo.html b/doc/main/tycho-surefire-plugin/bnd-test-mojo.html
index 8bb1c69e9..22c4f693e 100644
--- a/doc/main/tycho-surefire-plugin/bnd-test-mojo.html
+++ b/doc/main/tycho-surefire-plugin/bnd-test-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-surefire-plugin/index.html b/doc/main/tycho-surefire-plugin/index.html
index 2fff0e96d..4cfad7b79 100644
--- a/doc/main/tycho-surefire-plugin/index.html
+++ b/doc/main/tycho-surefire-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire-plugin/plugin-info.html b/doc/main/tycho-surefire-plugin/plugin-info.html
index 9f287affb..c7969d22a 100644
--- a/doc/main/tycho-surefire-plugin/plugin-info.html
+++ b/doc/main/tycho-surefire-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-surefire-plugin/plugin-test-mojo.html b/doc/main/tycho-surefire-plugin/plugin-test-mojo.html
index 909e32533..bbc7309fb 100644
--- a/doc/main/tycho-surefire-plugin/plugin-test-mojo.html
+++ b/doc/main/tycho-surefire-plugin/plugin-test-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-surefire-plugin/project-info.html b/doc/main/tycho-surefire-plugin/project-info.html
index c3fe01c43..154bbf53b 100644
--- a/doc/main/tycho-surefire-plugin/project-info.html
+++ b/doc/main/tycho-surefire-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire-plugin/project-reports.html b/doc/main/tycho-surefire-plugin/project-reports.html
index 6c7410213..be61f74ec 100644
--- a/doc/main/tycho-surefire-plugin/project-reports.html
+++ b/doc/main/tycho-surefire-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-surefire-plugin/test-mojo.html b/doc/main/tycho-surefire-plugin/test-mojo.html
index 9864d4a24..ba48da6f9 100644
--- a/doc/main/tycho-surefire-plugin/test-mojo.html
+++ b/doc/main/tycho-surefire-plugin/test-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-surefire-plugin/verify-mojo.html b/doc/main/tycho-surefire-plugin/verify-mojo.html
index d9527b584..58075c9a8 100644
--- a/doc/main/tycho-surefire-plugin/verify-mojo.html
+++ b/doc/main/tycho-surefire-plugin/verify-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-surefire/index.html b/doc/main/tycho-surefire/index.html
index eb908b38c..6675d7513 100644
--- a/doc/main/tycho-surefire/index.html
+++ b/doc/main/tycho-surefire/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/index.html
index e5e9a6bea..ea3bb71a5 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/project-info.html
index 0cdf5c578..668f8beca 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/index.html
index 10ebcca5b..7e3f86f4d 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/project-info.html
index c895be1a3..59d8a9b50 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/index.html
index d9d304742..e9c624f1a 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/project-info.html
index 6c3c89697..ea1a6a187 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit4/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/index.html
index eb45fec88..4899598a3 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/project-info.html
index 0eefca14f..f19b1ef1b 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit47/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/index.html
index 2298d74a4..e3ec8f0f5 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/project-info.html
index 7b21f91f1..a40287924 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit5/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/index.html
index 1dea0b787..8e13b4df8 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/project-info.html
index 265e99fe9..de4ef84b6 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit54/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/index.html
index bd20a892c..594f5f4c4 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/project-info.html
index 9fd96cdc8..1e012b5d9 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit55/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/index.html
index 21f32ed60..c1175c35d 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/project-info.html
index 90813a718..f7aaab867 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit56/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/index.html
index 80cbb7099..e28235abe 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/project-info.html
index 8a41b4bbe..3a1323545 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/index.html
index fd5a51d37..2507ccf3c 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/project-info.html
index 4d2ecba2a..01cf214a6 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/index.html
index 5608c87c4..c7d3f5c86 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/project-info.html
index 0d8f6acea..f6117b20d 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/index.html
index 04dcfa218..eec33300f 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/project-info.html
index 2079419c2..f53727b5f 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/index.html
index eb985d319..abb75a188 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/project-info.html
index 2283029be..f45cbf872 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/index.html
index 6b61a5ef7..5660a3ba5 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/project-info.html
index 8b67f523a..ce43769ac 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/index.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/index.html
index 10ac674ed..cc0eeb4e1 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/index.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/project-info.html b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/project-info.html
index e3415378c..2230f3859 100644
--- a/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/project-info.html
+++ b/doc/main/tycho-surefire/org.eclipse.tycho.surefire.testng/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-surefire/project-info.html b/doc/main/tycho-surefire/project-info.html
index 4fd5b450e..6bb22bc17 100644
--- a/doc/main/tycho-surefire/project-info.html
+++ b/doc/main/tycho-surefire/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-targetplatform/index.html b/doc/main/tycho-targetplatform/index.html
index 5df7d6185..4209c1313 100644
--- a/doc/main/tycho-targetplatform/index.html
+++ b/doc/main/tycho-targetplatform/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-targetplatform/project-info.html b/doc/main/tycho-targetplatform/project-info.html
index 700692bfc..a6e32aa5b 100644
--- a/doc/main/tycho-targetplatform/project-info.html
+++ b/doc/main/tycho-targetplatform/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-testing-harness/index.html b/doc/main/tycho-testing-harness/index.html
index bdac528e6..e5db3af5e 100644
--- a/doc/main/tycho-testing-harness/index.html
+++ b/doc/main/tycho-testing-harness/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-testing-harness/project-info.html b/doc/main/tycho-testing-harness/project-info.html
index 13b2b4a50..c23f2b9f5 100644
--- a/doc/main/tycho-testing-harness/project-info.html
+++ b/doc/main/tycho-testing-harness/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-versions-plugin/bump-versions-mojo.html b/doc/main/tycho-versions-plugin/bump-versions-mojo.html
index 2aa292ee0..9f298f5f6 100644
--- a/doc/main/tycho-versions-plugin/bump-versions-mojo.html
+++ b/doc/main/tycho-versions-plugin/bump-versions-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-versions-plugin/index.html b/doc/main/tycho-versions-plugin/index.html
index 32b370df9..bfefee5d1 100644
--- a/doc/main/tycho-versions-plugin/index.html
+++ b/doc/main/tycho-versions-plugin/index.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-versions-plugin/plugin-info.html b/doc/main/tycho-versions-plugin/plugin-info.html
index 969ad4155..4fffde461 100644
--- a/doc/main/tycho-versions-plugin/plugin-info.html
+++ b/doc/main/tycho-versions-plugin/plugin-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-versions-plugin/project-info.html b/doc/main/tycho-versions-plugin/project-info.html
index 60470788b..f2861fba7 100644
--- a/doc/main/tycho-versions-plugin/project-info.html
+++ b/doc/main/tycho-versions-plugin/project-info.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Information</a>
      <ul class="nav nav-list">
diff --git a/doc/main/tycho-versions-plugin/project-reports.html b/doc/main/tycho-versions-plugin/project-reports.html
index 4c7b1d362..07877d272 100644
--- a/doc/main/tycho-versions-plugin/project-reports.html
+++ b/doc/main/tycho-versions-plugin/project-reports.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li class="active"><a><span class="icon-chevron-down"></span>Project Reports</a>
diff --git a/doc/main/tycho-versions-plugin/set-parent-version-mojo.html b/doc/main/tycho-versions-plugin/set-parent-version-mojo.html
index 8e966a0a6..bc07e8f2c 100644
--- a/doc/main/tycho-versions-plugin/set-parent-version-mojo.html
+++ b/doc/main/tycho-versions-plugin/set-parent-version-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-versions-plugin/set-property-mojo.html b/doc/main/tycho-versions-plugin/set-property-mojo.html
index edc88d436..7b2c99d78 100644
--- a/doc/main/tycho-versions-plugin/set-property-mojo.html
+++ b/doc/main/tycho-versions-plugin/set-property-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-versions-plugin/set-version-mojo.html b/doc/main/tycho-versions-plugin/set-version-mojo.html
index 923d06c77..cb417171e 100644
--- a/doc/main/tycho-versions-plugin/set-version-mojo.html
+++ b/doc/main/tycho-versions-plugin/set-version-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-versions-plugin/update-eclipse-metadata-mojo.html b/doc/main/tycho-versions-plugin/update-eclipse-metadata-mojo.html
index 1c4bec220..bfda888ed 100644
--- a/doc/main/tycho-versions-plugin/update-eclipse-metadata-mojo.html
+++ b/doc/main/tycho-versions-plugin/update-eclipse-metadata-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>
diff --git a/doc/main/tycho-versions-plugin/update-pom-mojo.html b/doc/main/tycho-versions-plugin/update-pom-mojo.html
index 1e1748572..92866eadc 100644
--- a/doc/main/tycho-versions-plugin/update-pom-mojo.html
+++ b/doc/main/tycho-versions-plugin/update-pom-mojo.html
@@ -39,39 +39,51 @@
         <header id="leftColumn" class="span2">
           <nav class="well sidebar-nav">
   <ul class="nav nav-list">
-   <li class="nav-header">Tycho</li>
-    <li><a href="../index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
+   <li class="nav-header">Using Tycho</li>
+    <li><a href="../index.html" title="Overview"><span class="none"></span>Overview</a></li>
     <li><a href="../StructuredBuild.html" title="Structured Build Layout and Pomless Builds"><span class="none"></span>Structured Build Layout and Pomless Builds</a></li>
-    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="none"></span>BND Workspace and Pomless Builds</a></li>
-    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="none"></span>Packaging Types</a></li>
-    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="none"></span>Target Platform</a></li>
-    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="none"></span>Testing Bundles</a></li>
+    <li><a href="../BndBuild.html" title="BND Workspace and Pomless Builds"><span class="icon-chevron-down"></span>BND Workspace and Pomless Builds</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-bnd-plugin/plugin-info.html" title="Tycho BND Plugin"><span class="none"></span>Tycho BND Plugin</a></li>
+     </ul></li>
+    <li><a href="../PackagingTypes.html" title="Packaging Types"><span class="icon-chevron-down"></span>Packaging Types</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Tycho Packaging Plugin"><span class="none"></span>Tycho Packaging Plugin</a></li>
+     </ul></li>
+    <li><a href="../TargetPlatform.html" title="Target Platform"><span class="icon-chevron-down"></span>Target Platform</a>
+     <ul class="nav nav-list">
+      <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration Plugin"><span class="none"></span>Target Platform Configuration Plugin</a></li>
+      <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
+     </ul></li>
+    <li><a href="../TestingBundles.html" title="Testing Bundles"><span class="icon-chevron-down"></span>Testing Bundles</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Tycho Surefire Plugin"><span class="none"></span>Tycho Surefire Plugin</a></li>
+     </ul></li>
     <li><a href="../TychoCiFriendly.html" title="Tycho CI Friendly Versions"><span class="none"></span>Tycho CI Friendly Versions</a></li>
-    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="none"></span>Creating update sites using category.xml</a></li>
-    <li><a href="../target-platform-configuration/plugin-info.html" title="Target Platform Configuration"><span class="none"></span>Target Platform Configuration</a></li>
-    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
-    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
-    <li><a href="../tycho-packaging-plugin/plugin-info.html" title="Packaging Plugin"><span class="none"></span>Packaging Plugin</a></li>
-    <li><a href="../tycho-surefire-plugin/plugin-info.html" title="Surefire Plugin"><span class="none"></span>Surefire Plugin</a></li>
-    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="p2 Publisher Plugin"><span class="none"></span>p2 Publisher Plugin</a></li>
-    <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="p2 Repository Plugin"><span class="none"></span>p2 Repository Plugin</a></li>
-    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="p2 Director Plugin"><span class="none"></span>p2 Director Plugin</a></li>
-    <li><a href="../tycho-p2-plugin/plugin-info.html" title="p2 Metadata Plugin"><span class="none"></span>p2 Metadata Plugin</a></li>
-    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
-    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
-    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
+    <li><a href="../Category.html" title="Creating update sites using category.xml"><span class="icon-chevron-down"></span>Creating update sites using category.xml</a>
+     <ul class="nav nav-list">
+      <li><a href="../tycho-p2-repository-plugin/plugin-info.html" title="Tycho P2 Repository Plugin"><span class="none"></span>Tycho P2 Repository Plugin</a></li>
+     </ul></li>
     <li><a href="" title="Properties"><span class="icon-chevron-down"></span>Properties</a>
      <ul class="nav nav-list">
       <li><a href="../BuildProperties.html" title="Build Properties"><span class="none"></span>Build Properties</a></li>
       <li><a href="../SystemProperties.html" title="System Properties"><span class="none"></span>System Properties</a></li>
       <li><a href="../TychoProperties.html" title="Tycho Properties"><span class="none"></span>Tycho Properties</a></li>
      </ul></li>
-   <li class="nav-header">Tycho Extras</li>
-    <li><a href="../tycho-extras/index.html" title="Introduction"><span class="none"></span>Introduction</a></li>
-    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
-    <li><a href="../tycho-extras/target-platform-validation-plugin/plugin-info.html" title="Target Platform Validation Plugin"><span class="none"></span>Target Platform Validation Plugin</a></li>
-    <li><a href="../tycho-extras/tycho-eclipserun-plugin/plugin-info.html" title="Eclipserun Plugin"><span class="none"></span>Eclipserun Plugin</a></li>
+   <li class="nav-header">Other Tycho Plugins</li>
+    <li><a href="../tycho-baseline-plugin/plugin-info.html" title="Baseline Plugin"><span class="none"></span>Baseline Plugin</a></li>
+    <li><a href="../tycho-compiler-plugin/plugin-info.html" title="Compiler Plugin"><span class="none"></span>Compiler Plugin</a></li>
+    <li><a href="../tycho-ds-plugin/plugin-info.html" title="Declarative Services Plugin"><span class="none"></span>Declarative Services Plugin</a></li>
     <li><a href="../tycho-extras/tycho-document-bundle-plugin/plugin-info.html" title="Document Bundle Plugin"><span class="none"></span>Document Bundle Plugin</a></li>
+    <li><a href="../tycho-eclipse-plugin/plugin-info.html" title="Eclipse Plugin"><span class="none"></span>Eclipse Plugin</a></li>
+    <li><a href="../tycho-gpg-plugin/plugin-info.html" title="GPG Signature Plugin"><span class="none"></span>GPG Signature Plugin</a></li>
+    <li><a href="../tycho-p2-director-plugin/plugin-info.html" title="P2 Director Plugin"><span class="none"></span>P2 Director Plugin</a></li>
+    <li><a href="../tycho-p2-plugin/plugin-info.html" title="P2 Metadata Plugin"><span class="none"></span>P2 Metadata Plugin</a></li>
+    <li><a href="../tycho-p2-publisher-plugin/plugin-info.html" title="P2 Publisher Plugin"><span class="none"></span>P2 Publisher Plugin</a></li>
+    <li><a href="../tycho-extras/tycho-p2-extras-plugin/plugin-info.html" title="P2 Extras Plugin"><span class="none"></span>P2 Extras Plugin</a></li>
+    <li><a href="../tycho-apitools-plugin/plugin-info.html" title="PDE API Tools Plugin"><span class="none"></span>PDE API Tools Plugin</a></li>
+    <li><a href="../tycho-source-plugin/plugin-info.html" title="Source Plugin"><span class="none"></span>Source Plugin</a></li>
+    <li><a href="../tycho-versions-plugin/plugin-info.html" title="Versions Plugin"><span class="none"></span>Versions Plugin</a></li>
    <li class="nav-header">Project Documentation</li>
     <li><a href="project-info.html" title="Project Information"><span class="icon-chevron-right"></span>Project Information</a></li>
     <li><a href="project-reports.html" title="Project Reports"><span class="icon-chevron-right"></span>Project Reports</a></li>