Client info
diff --git a/new/paho/clients/android/index.php b/new/paho/clients/android/index.php
index b994f96..5e06c33 100644
--- a/new/paho/clients/android/index.php
+++ b/new/paho/clients/android/index.php
@@ -1,10 +1,3 @@
-<?php include '../../_includes/header.php' ?>
-<!DOCTYPE html>
-<html>
-<head>
-    <title></title>
-</head>
-<body>
     <div class="panel panel-default">
         <div class="panel-body">
             <h1>Eclipse Paho Android Service</h1>
@@ -35,7 +28,7 @@
                     "sync" => false,
                     "ha" => true
                 );
-                include '../../_includes/features_list.php';
+                include 'paho/_includes/features_list.php';
                 getFeatures($features);
 
             ?>
@@ -166,4 +159,4 @@
             <p>Reference documentation is online at: <a href=
             "http://www.eclipse.org/paho/files/android-javadoc/index.html">http://www.eclipse.org/paho/files/android-javadoc/index.html</a></p>
         </div>
-    </div><?php include '../../_includes/footer.php' ?>
+
diff --git a/new/paho/clients/c/embedded-sn/index.php b/new/paho/clients/c/embedded-sn/index.php
index 868d7db..aba41a9 100644
--- a/new/paho/clients/c/embedded-sn/index.php
+++ b/new/paho/clients/c/embedded-sn/index.php
@@ -1,4 +1,3 @@
-<?php include '../../../_includes/header.php' ?>
 <div class="panel panel-default">
 <div class="panel-body">
 <h1>Embedded MQTT-SN C/C++ Client</h1>
@@ -97,4 +96,4 @@
 </pre>
 </div>
 </div>
-<?php include '../../../_includes/footer.php' ?>
+
diff --git a/new/paho/clients/c/index.php b/new/paho/clients/c/index.php
index 5bcf538..af4196e 100644
--- a/new/paho/clients/c/index.php
+++ b/new/paho/clients/c/index.php
@@ -1,4 +1,3 @@
-<?php include '../../_includes/header.php' ?>
 <div class="panel panel-default">
 <div class="panel-body">
 <h1>MQTT C Client for Posix and Windows</h1>
@@ -173,3 +172,4 @@
 </pre>
 </div>
 </div>
+
diff --git a/new/paho/clients/cpp/index.php b/new/paho/clients/cpp/index.php
index 67e867c..b16acaf 100644
--- a/new/paho/clients/cpp/index.php
+++ b/new/paho/clients/cpp/index.php
@@ -1,4 +1,3 @@
-<?php include '../../_includes/header.php' ?>
 <div class="panel panel-default">
 <div class="panel-body">
 <h1>MQTT C++ Client for Posix and Windows</h1>
@@ -24,7 +23,7 @@
         "sync" => true,
         "ha" => true
     );
-    include '../../_includes/features_list.php';
+    include 'paho/_includes/features_list.php';
     getFeatures($features);
 
 
@@ -108,4 +107,3 @@
 </pre>
 </div>
 </div>
-<?php include '../../_includes/footer.php' ?>
diff --git a/new/paho/clients/dotnet/index.php b/new/paho/clients/dotnet/index.php
index 25453e0..fbf8ae7 100644
--- a/new/paho/clients/dotnet/index.php
+++ b/new/paho/clients/dotnet/index.php
@@ -1,4 +1,3 @@
-<?php include '../../_includes/header.php' ?>
 <div class="panel panel-default">
 <div class="panel-body">
 <h1>C# .Net and WinRT Client</h1>
@@ -21,7 +20,7 @@
         "sync" => false,
         "ha" => false
     );
-    include '../../_includes/features_list.php';
+    include 'paho/_includes/features_list.php';
     getFeatures($features);
 
 
@@ -83,4 +82,3 @@
 </pre>
 </div>
 </div>
-<?php include '../../_includes/footer.php' ?>
diff --git a/new/paho/clients/golang/index.php b/new/paho/clients/golang/index.php
index c7ff820..1c59910 100644
--- a/new/paho/clients/golang/index.php
+++ b/new/paho/clients/golang/index.php
@@ -1,4 +1,3 @@
-<?php include '../../_includes/header.php' ?>
 <div class="panel panel-default">
 <div class="panel-body">
 <h1>Go Client</h1>
@@ -21,7 +20,7 @@
         "sync" => false,
         "ha" => true
     );
-    include '../../_includes/features_list.php';
+    include 'paho/_includes/features_list.php';
     getFeatures($features);
 
 
@@ -112,4 +111,3 @@
 </pre>
 </div>
 </div>
-<?php include '../../_includes/footer.php' ?>
diff --git a/new/paho/clients/java/index.php b/new/paho/clients/java/index.php
index 468b7bf..7361643 100644
--- a/new/paho/clients/java/index.php
+++ b/new/paho/clients/java/index.php
@@ -1,10 +1,4 @@
-<?php include '../../_includes/header.php' ?>
-<!DOCTYPE html>
-<html>
-<head>
-    <title></title>
-</head>
-<body>
+
     <div class="panel panel-default">
         <div class="panel-body">
             <h1>Eclipse Paho Java Client</h1>
@@ -33,7 +27,7 @@
                     "sync" => true,
                     "ha" => true
                 );
-                include '../../_includes/features_list.php';
+                include 'paho/_includes/features_list.php';
                 getFeatures($features);
 
 
@@ -175,7 +169,7 @@
             }
         }
     }</pre>
-        </div>
-    </div><?php include '../../_includes/footer.php' ?>
-</body>
-</html>
+        
+    </div>
+    </div>
+
diff --git a/new/paho/clients/js/index.php b/new/paho/clients/js/index.php
index 4610ecc..d6b14d5 100644
--- a/new/paho/clients/js/index.php
+++ b/new/paho/clients/js/index.php
@@ -1,4 +1,3 @@
-<?php include '../../_includes/header.php' ?>
 <div class="panel panel-default">
     <div class="panel-body">
         <h1>Eclipse Paho JavaScript Client</h1>
@@ -25,7 +24,7 @@
                         "sync" => false,
                         "ha" => true
                     );
-                    include '../../_includes/features_list.php';
+                    include 'paho/_includes/features_list.php';
                     getFeatures($features);
 
 
@@ -132,8 +131,5 @@
   console.log("onMessageArrived:"+message.payloadString);
 }
 </pre>
-
-
-    </div>
 </div>
-<?php include '../../_includes/footer.php' ?>
+</div>
diff --git a/new/paho/clients/js/utility/index.php b/new/paho/clients/js/utility/index.php
index e7bbc76..2410f2a 100644
--- a/new/paho/clients/js/utility/index.php
+++ b/new/paho/clients/js/utility/index.php
@@ -1,4 +1,3 @@
-<?php include '../../../_includes/header.php' ?>
 <div class="content" style="margin-top:30px;">
   <style type="text/css" scoped>
     .special-checkbox {
@@ -337,4 +336,3 @@
 
 <!-- Utility Javascript -->
 <script src="utility.js"></script>
-<?php include '../../../_includes/footer.php' ?>
diff --git a/new/paho/clients/python/index.php b/new/paho/clients/python/index.php
index e4302e6..b5764fd 100644
--- a/new/paho/clients/python/index.php
+++ b/new/paho/clients/python/index.php
@@ -1,4 +1,3 @@
-<?php include '../../_includes/header.php' ?>
 <div class="panel panel-default">
 <div class="panel-body">
 <h1>Python Client</h1>
@@ -21,7 +20,7 @@
         "sync" => true,
         "ha" => false
     );
-    include '../../_includes/features_list.php';
+    include 'paho/_includes/features_list.php';
     getFeatures($features);
 
 
@@ -76,4 +75,3 @@
 </pre>
 </div>
 </div>
-<?php include '../../_includes/footer.php' ?>
diff --git a/new/paho/clients/rust/index.php b/new/paho/clients/rust/index.php
index 24ec36c..1146e01 100644
--- a/new/paho/clients/rust/index.php
+++ b/new/paho/clients/rust/index.php
@@ -1,4 +1,3 @@
-<?php include '../../_includes/header.php' ?>
 <div class="panel panel-default">
 <div class="panel-body">
 <h1>MQTT Rust Client</h1>
@@ -25,7 +24,7 @@
         "sync" => true,
         "ha" => true
     );
-    include '../../_includes/features_list.php';
+    include 'paho/_includes/features_list.php';
     getFeatures($features);
 
 
@@ -97,4 +96,3 @@
 </pre>
 </div>
 </div>
-<?php include '../../_includes/footer.php' ?>
diff --git a/new/paho/downloads.php b/new/paho/downloads.php
index 6b24cfb..205b730 100644
--- a/new/paho/downloads.php
+++ b/new/paho/downloads.php
@@ -54,25 +54,25 @@
              </thead>
              <tbody>
                  <tr>
-                    <th scope="row"><a href="https://www.eclipse.org/paho/clients/java/">Java</a></th>
+                    <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/java/index.php">Java</a></th>
                     <td>1.1.1 - <a target="_blank" href="http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.paho.client.mqttv3%22">Maven Central</a></td>
                     <td>1.1.2-SNAPSHOT - <a target="_blank" href="https://repo.eclipse.org/content/repositories/paho-snapshots/org/eclipse/paho/org.eclipse.paho.client.mqttv3/1.1.2-SNAPSHOT/">Eclipse</a></td>
                     <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.java">https://github.com/eclipse/paho.mqtt.java</a></td>
                 </tr>
                 <tr>
-                    <th scope="row"><a href="https://www.eclipse.org/paho/clients/python/">Python</a></th>
+                    <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/python/index.php">Python</a></th>
 		            <td>1.5.0 - <a target="_blank" href="https://pypi.org/project/paho-mqtt/">Pypi (Pip)</a></td>
                     <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.python/tree/develop"><i>Build from develop branch</i></a></td>
                     <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.python">https://github.com/eclipse/paho.mqtt.python</a></td>
                 </tr>
                 <tr>
-                   <th scope="row"><a href="https://www.eclipse.org/paho/clients/js/">JavaScript</a></th>
+                   <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/js/index.php">JavaScript</a></th>
                    <td>1.0.3 - <a target="_blank" href="https://www.eclipse.org/downloads/download.php?file=/paho/releases/1.0.3/paho.javascript-1.0.3.zip">Eclipse</a></td>
                    <td>1.0.4-SNAPSHOT - <a target="_blank" href="https://github.com/eclipse/paho.mqtt.javascript/tree/develop"><i>Build from develop branch</i></a></td>
                    <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.javascript">https://github.com/eclipse/paho.mqtt.javascript</a></td>
                </tr>
                <tr>
-                   <th scope="row"><a href="https://www.eclipse.org/paho/clients/golang/">Golang</a></th>
+                   <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/golang/index.php">Golang</a></th>
                    <td>1.1.0 - <a target="_blank" href="https://github.com/eclipse/paho.mqtt.golang/releases/tag/v1.1.0">Github repo tag v1.1.0</a></td>
                    <td><code>go get github.com/eclipse/paho.mqtt.golang</code></td>
                    <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.golang">https://github.com/eclipse/paho.mqtt.golang</a></td>
@@ -84,25 +84,25 @@
                    <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.c">https://github.com/eclipse/paho.mqtt.c</a></td>
                </tr>
                <tr>
-                  <th scope="row"><a href="https://www.eclipse.org/paho/clients/cpp/">C++</a></th>
+                  <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/cpp/index.php">C++</a></th>
                   <td>1.0.0 - <a target="_blank" href="https://github.com/eclipse/paho.mqtt.cpp/releases/tag/v1.0.0"><i>Build from source</i></a></td>
                   <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.cpp/tree/master"><i>Build from master branch</i></a></td>
                   <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.cpp">https://github.com/eclipse/paho.mqtt.cpp</a></td>
                </tr>
                <tr>
-                  <th scope="row"><a href="https://www.eclipse.org/paho/clients/rust/">Rust</a></th>
+                  <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/rust/index.php">Rust</a></th>
                   <td><i>Coming soon</i></td>
                   <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.rust/tree/develop"><i>Build from develop branch</i></a></td>
                   <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.rust">https://github.com/eclipse/paho.mqtt.rust</a></td>
                </tr>
                <tr>
-                  <th scope="row"><a href="https://www.eclipse.org/paho/clients/dotnet/">.Net (C#)</a></th>
+                  <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/dotnet/index.php">.Net (C#)</a></th>
                   <td>4.3.0 - <a target="_blank" href="https://www.nuget.org/packages/M2Mqtt/4.3.0">NuGet</a></td>
                   <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.m2mqtt/tree/master"><i>Build from master branch</i></a></td>
                   <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.m2mqtt">https://github.com/eclipse/paho.mqtt.m2mqtt</a></td>
                </tr>
                <tr>
-                  <th scope="row"><a href="https://www.eclipse.org/paho/clients/android/">Android Service</a></th>
+                  <th scope="row"><a href="https://www.eclipse.org/paho/new/index.php?page=clients/android/index.php">Android Service</a></th>
                   <td>1.1.1 - <a target="_blank" href="https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22org.eclipse.paho.android.service%22">Eclipse</a></td>
                   <td>1.1.2-SNAPSHOT - <a target="_blank" href="https://repo.eclipse.org/content/repositories/paho-snapshots/org/eclipse/paho/org.eclipse.paho.android.service/1.1.2-SNAPSHOT/">Eclipse</a></td>
                   <td><a target="_blank" href="https://github.com/eclipse/paho.mqtt.android">https://github.com/eclipse/paho.mqtt.android</a></td>