diff --git a/_includes/bare_header.php b/_includes/bare_header.php
index c5d2991..c443739 100644
--- a/_includes/bare_header.php
+++ b/_includes/bare_header.php
@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <title>
-            Paho - Open Source messaging for M2M
+            Eclipse Paho - MQTT and MQTT-SN software
         </title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="Eclipse Paho is a set of scalable open-source implementations of open and standard messaging protocols aimed at new, existing, and emerging applications for Machine-to-Machine (M2M) and Internet of Things (IoT)">
@@ -62,16 +62,18 @@
                                   <li><a href="/paho/clients/golang/">Go</a></li>
                                   <li><a href="/paho/clients/dotnet/">C# .Net and WinRT</a></li>
                                   <!-- <li><a href="/paho/clients/lua/">Lua</a></li> -->
+                                  <li><a href="/paho/components/mqtt-spy">MQTT Spy</a></li>
                                   <li class="divider"></li>
                                   <li class="dropdown-header">MQTT-SN</li>
                                   <li><a href="/paho/clients/c/embedded-sn/">C (Embedded)</a></li>
+                                  <li><a href="/paho/components/mqtt-sn-transparent-gateway/">Transparent Gateway</a></li>
                                   <li class="divider"></li>
                                   <li class="dropdown-header">Utilities</li>
-                                  <li><a href="/paho/clients/tool/">Client Tools</a></li>
+                                  <li><a href="/paho/componentss/tool/">Client Tools</a></li>
                                   <li><a href="/paho/clients/android/sample">Android Sample</a></li>
                                   <!-- <li><a href="/paho/utilities/client-view/">MQTT Eclipse Client View (IDE plugin)</a></li> -->
                                   <!-- <li><a href="/paho/utilities/client-utility/">MQTT Client Utility (java)</a></li> -->
-                                  <li><a href="/paho/clients/testing/">Interop Tests</a></li>
+                                  <li><a href="/paho/components/testing/">Testing</a></li>
                               </ul>
                           </li>
                           <li class="dropdown">
diff --git a/components/mqtt-sn-transparent-gateway/index.php b/components/mqtt-sn-transparent-gateway/index.php
new file mode 100644
index 0000000..f6a4ded
--- /dev/null
+++ b/components/mqtt-sn-transparent-gateway/index.php
@@ -0,0 +1,38 @@
+<?php include '../../_includes/header.php' ?>
+<div class="panel panel-default">
+<div class="panel-body">
+<h1>MQTT-SN Transparent Gateway</h1>
+
+<p>The MQTT-SN Transparent Gateway is a daemon, or small server, which accepts incoming
+MQTT-SN data over a number of transports (UDP, XBee) and converts it into
+MQTT appropriate for connecting to an MQTT server such as
+<a href="https://mosquitto.org">Eclipse Mosquitto</a>.  Currently it only works on Linux.</p>
+
+</p>A description of how transparent and aggregating gateways are intended to
+work can be found in the <a href="http://mqtt.org/new/wp-content/uploads/2009/06/MQTT-SN_spec_v1.2.pdf">MQTT-SN specification</a>.</p>
+
+<h2 id="source">Source</h2>
+
+<p>The gateway is a sub-project of the Eclipse Paho MQTT-SN embedded C repository - it's source can be found
+<a href="https://github.com/eclipse/paho.mqtt-sn.embedded-c/tree/master/MQTTSNGateway">here</a>.
+
+<h2 id="download">Download</h2>
+
+<p>There are no pre-built binary downloads today - you must build from source.</a>.
+
+<h2 id="build-from-source">Building from source</h2>
+
+<p>Guidelines for building from source are in the
+<a href="https://github.com/eclipse/paho.mqtt-sn.embedded-c/blob/master/MQTTSNGateway/README.md">readme</a>.</p>
+
+<h2 id="documentation">Documentation</h2>
+
+<p>Documentation is online <a href="https://github.com/eclipse/paho.mqtt-sn.embedded-c/tree/master/MQTTSNGateway">here</a>.</p>
+
+<h3 id="getting-started">Getting Started</h3>
+
+<a href="https://github.com/eclipse/paho.mqtt-sn.embedded-c/tree/master/MQTTSNGateway">Getting started</a>.
+
+</div>
+</div>
+<?php include '../../_includes/footer.php' ?>
diff --git a/components/mqtt-spy/index.php b/components/mqtt-spy/index.php
new file mode 100644
index 0000000..3b1fdf2
--- /dev/null
+++ b/components/mqtt-spy/index.php
@@ -0,0 +1,36 @@
+<?php include '../../_includes/header.php' ?>
+<div class="panel panel-default">
+<div class="panel-body">
+<h1>MQTT Spy</h1>
+
+<p>mqtt-spy is an open source utility intended to help you with monitoring activity on MQTT topics.
+It's been designed to deal with high volumes of messages, as well as occasional publications.</p>
+
+<p>mqtt-spy is a JavaFX application, so should work on any operating system with an appropriate version of Java 8 installed.
+It's been tried on various Linux distributions (Mint, Ubuntu, RedHat) and Windows 7/8.</p>
+
+<p>mqtt-spy-daemon is a Java-based command line tool that does not require a GUI environment.
+Basic functionality works with Java 7, whereas some of the advanced features like scripting require Java 8 to be installed.</p>
+
+<h2 id="source">Source</h2>
+
+<p>Source for all releases is available from the <a href="https://github.com/eclipse/paho.mqtt-spy/releases">Git repository</a>.
+
+<h2 id="download">Download</h2>
+
+<p>Downloads are available from the same <a href="https://github.com/eclipse/paho.mqtt-spy/releases">Git repository</a>.
+
+<h2 id="build-from-source">Building from source</h2>
+
+
+<h2 id="documentation">Documentation</h2>
+
+<p>Documentation is online <a href="https://github.com/eclipse/paho.mqtt-spy/wiki">here</a>.</p>
+
+<h3 id="getting-started">Getting Started</h3>
+
+<a href="https://github.com/eclipse/paho.mqtt-spy/wiki/GettingStarted">Getting started</a>.
+
+</div>
+</div>
+<?php include '../../_includes/footer.php' ?>
diff --git a/clients/testing/index.php b/components/testing/index.php
similarity index 100%
rename from clients/testing/index.php
rename to components/testing/index.php
diff --git a/clients/tool/index.php b/components/tool/index.php
similarity index 100%
rename from clients/tool/index.php
rename to components/tool/index.php