diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 24b1ca6c..bf64acab 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -79,10 +79,18 @@
           <li><a href="{{ site_url('docs/spec/i2np') }}"><span>I2NP</span></a></li>
           <li><a href="{{ site_url('docs/spec/plugin') }}"><span>{{ _('Plugins') }}</span></a></li>
           <li><a href="{{ site_url('docs/spec/ssu') }}"><span>SSU</span></a></li>
+          <li><a href="{{ site_url('docs/spec/tunnel_creation') }}"><span>{{ _('Tunnel creation') }}</span></a></li>
           <li><a href="{{ site_url('docs/spec/tunnel_message') }}"><span>{{ _('Tunnel messages') }}</span></a></li>
           <li><a href="{{ site_url('docs/spec/updates') }}"><span>{{ _('Software updates') }}</span></a></li>
         </ul>
       </li>
+      <li class="has-sub"><a href="#"><span>{{ _('Tunnels') }}</span></a>
+        <ul>
+          <li><a href="{{ site_url('docs/tunnels/implementation') }}"><span>{{ _('Tunnel implementation') }}</span></a></li>
+          <li><a href="{{ site_url('docs/tunnels/unidirectional') }}"><span>{{ _('Unidirectional tunnels') }}</span></a></li>
+          <li><a href="{{ site_url('docs/tunnels/old') }}"><span>{{ _('Old implementation') }}</span></a></li>
+        </ul>
+      </li>
       <li><a href="{{ site_url('docs/naming') }}"><span>{{ _('Naming and addressbook') }}</span></a></li>
       <li><a href="{{ site_url('docs/plugins') }}"><span>{{ _('Plugins') }}</span></a></li>
     </ul>
diff --git a/www.i2p2/pages/tunnel-alt-creation.html b/i2p2www/pages/site/docs/spec/tunnel_creation.html
similarity index 100%
rename from www.i2p2/pages/tunnel-alt-creation.html
rename to i2p2www/pages/site/docs/spec/tunnel_creation.html
diff --git a/www.i2p2/pages/tunnel-alt.html b/i2p2www/pages/site/docs/tunnels/implementation.html
similarity index 93%
rename from www.i2p2/pages/tunnel-alt.html
rename to i2p2www/pages/site/docs/tunnels/implementation.html
index cc64b17b..8798ad91 100644
--- a/www.i2p2/pages/tunnel-alt.html
+++ b/i2p2www/pages/site/docs/tunnels/implementation.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Tunnel Implementation{% endblock %}
 {% block content %}
 
@@ -50,13 +50,13 @@ including message reordering, retransmission, congestion control, etc.</p>
 
 <p>
 An overview of I2P tunnel terminology is
-<a href="how_tunnelrouting.html">on the tunnel overview page</a>.
+<a href="{{ site_url('docs/how/tunnelrouting') }}">on the tunnel overview page</a>.
 </p>
 
 <h2 id="tunnel.operation">Tunnel Operation (Message Processing)</h2>
 <h3>Overview</h3>
 
-<p>After a tunnel is built, <a href="i2np.html">I2NP messages</a> are processed and passed through it.
+<p>After a tunnel is built, <a href="{{ site_url('docs/spec/i2np') }}">I2NP messages</a> are processed and passed through it.
 Tunnel operation has four distinct processes, taken on by various 
 peers in the tunnel.  <ol><li>First, the tunnel gateway accumulates a number
 of I2NP messages and preprocesses them into tunnel messages for
@@ -77,7 +77,7 @@ so that the plaintext is revealed at the outbound endpoint.
 </p>
 <p>
 <center>
-      <img src="/_static/images/tunnels.png" alt="Inbound and outbound tunnel schematic" title="Inbound and outbound tunnel schematic" />
+      <img src="{{ url_for('static', filename='images/tunnels.png') }}" alt="Inbound and outbound tunnel schematic" title="Inbound and outbound tunnel schematic" />
 </center>
 </p>
 
@@ -133,8 +133,8 @@ so that the plaintext is revealed at the outbound endpoint.
 <h4 id="tunnel.preprocessing">Message Preprocessing</h4>
 
 <p>A tunnel gateway's function is to fragment and pack
-<a href="i2np.html">I2NP messages</a> into fixed-size
-<a href="tunnel_message_spec.html">tunnel messages</a>
+<a href="{{ site_url('docs/spec/i2np') }}">I2NP messages</a> into fixed-size
+<a href="{{ site_url('docs/spec/tunnel_message') }}">tunnel messages</a>
 and encrypt the tunnel messages.
 Tunnel messages contain the following:
 
@@ -163,7 +163,7 @@ fragments for a short period of time, but will discard them as necessary.</p>
 <p>
 
 Details are in the
-<a href="tunnel_message_spec.html">tunnel message specification</a>.
+<a href="{{ site_url('docs/spec/tunnel_message') }}">tunnel message specification</a>.
 
 
 
@@ -250,7 +250,7 @@ use in client tunnels.</p>
 
 <p>
 Exploratory peer selection is discussed further on the
-<a href="how_peerselection.html">Peer Profiling and Selection page</a>.
+<a href="{{ site_url('docs/how/peerselection') }}">Peer Profiling and Selection page</a>.
 
 
 <h4 id="tunnel.selection.client">Client tunnel peer selection</h4>
@@ -263,7 +263,7 @@ should be adhered to, depending upon the client's anonymity needs.</p>
   
 <p>
 Client peer selection is discussed further on the
-<a href="how_peerselection.html">Peer Profiling and Selection page</a>.
+<a href="{{ site_url('docs/how/peerselection') }}">Peer Profiling and Selection page</a>.
 
 <h4 id="ordering">Peer Ordering within Tunnels</h4>
 
@@ -305,7 +305,7 @@ this is "non-interactive" telescopic tunnel building.
 
 
 <p>This tunnel request preparation, delivery, and response method is
-<a href="tunnel-alt-creation.html">designed</a> to reduce the number of
+<a href="{{ site_url('docs/spec/tunnel_creation') }}">designed</a> to reduce the number of
 predecessors exposed, cuts the number of messages transmitted, verifies proper
 connectivity, and avoids the message counting attack of traditional telescopic
 tunnel creation.
@@ -314,7 +314,7 @@ part of the tunnel, is termed "interactive" telescopic tunnel building in
 the "Hashing it out" paper.)
 
 <p>The details of tunnel request and response messages, and their encryption,
-<a href="tunnel-alt-creation.html">are specified here</a>.
+<a href="{{ site_url('docs/spec/tunnel_creation') }}">are specified here</a>.
 
 <p>Peers may reject tunnel creation requests for a variety of reasons, though
 a series of four increasingly severe rejections are known: probabilistic rejection
@@ -324,7 +324,7 @@ those four are interpreted by the tunnel creator to help adjust their profile of
 the router in question.
 <p>
 For more information on peer profiling, see the
-<a href="how_peerselection.html">Peer Profiling and Selection page</a>.
+<a href="{{ site_url('docs/how/peerselection') }}">Peer Profiling and Selection page</a>.
 
 <h3 id="tunnel.pooling">Tunnel Pools</h3>
 
@@ -335,7 +335,7 @@ out of the appropriate pool at random.  Overall, there are two exploratory tunne
 pools - one inbound and one outbound - each using the router's default configuration.
 In addition, there is a pair of pools for each local destination -
 one inbound and one outbound tunnel pool.  Those pools use the configuration specified
-when the local destination connects to the router via <a href="i2cp.html">I2CP</a>, or the router's defaults if
+when the local destination connects to the router via <a href="{{ site_url('docs/spec/i2cp') }}">I2CP</a>, or the router's defaults if
 not specified.</p>
 
 <p>Each pool has within its configuration a few key settings, defining how many
@@ -347,7 +347,7 @@ Configuration options are specified on the <a href="i2cp.html">I2CP page</a>.
 
 <h3 id="length">Tunnel Lengths and Defaults</h3>
 
-<a href="how_tunnelrouting.html#length">On the tunnel overview page</a>.
+<a href="{{ site_url('docs/how/tunnelrouting') }}#length">On the tunnel overview page</a>.
 
 <h3 id="strategy">Anticipatory Build Strategy and Priority</h3>
 
diff --git a/www.i2p2/pages/tunnel.html b/i2p2www/pages/site/docs/tunnels/old.html
similarity index 99%
rename from www.i2p2/pages/tunnel.html
rename to i2p2www/pages/site/docs/tunnels/old.html
index c9e82cc5..d5f33d5d 100644
--- a/www.i2p2/pages/tunnel.html
+++ b/i2p2www/pages/site/docs/tunnels/old.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Old Tunnel Implementation{% endblock %}
 {% block content %}
 
diff --git a/www.i2p2/pages/unidirectional-tunnels.html b/i2p2www/pages/site/docs/tunnels/unidirectional.html
similarity index 91%
rename from www.i2p2/pages/unidirectional-tunnels.html
rename to i2p2www/pages/site/docs/tunnels/unidirectional.html
index 5d82c220..0229d013 100644
--- a/www.i2p2/pages/unidirectional-tunnels.html
+++ b/i2p2www/pages/site/docs/tunnels/unidirectional.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Unidirectional Tunnels{% endblock %}
 {% block content %}
 <p>
@@ -11,17 +11,17 @@ This page describes the origins and design of I2P's unidirectional tunnels.
 For further infomrmation see:
 <ul>
 <li>
-<a href="how_tunnelrouting.html">tunnel overview page</a>
+<a href="{{ site_url('docs/how/tunnelrouting') }}">tunnel overview page</a>
 <li>
-<a href="tunnel-alt.html">tunnel specification</a>
+<a href="{{ site_url('docs/tunnels/implementation') }}">tunnel specification</a>
 </li><li>
-<a href="tunnel-alt-creation.html">tunnel creation specification</a>
+<a href="{{ site_url('docs/spec/tunnel_creation') }}">tunnel creation specification</a>
 </li><li>
-<a href="tunnel_discussion.html">tunnel design discussion</a>
+<a href="{{ site_url('docs/discussions/tunnel') }}">tunnel design discussion</a>
 </li><li>
-<a href="how_peerselection.html">peer selection</a>
+<a href="{{ site_url('docs/how/peerselection') }}">peer selection</a>
 </li><li>
-<a href="meeting125.html">Meeting 125 (~13:12-13:30)</a>
+<a href="{{ url_for('meetings_show', id=125) }}">Meeting 125 (~13:12-13:30)</a>
 </li>
 </ul>
 </p>