diff --git a/i2p2www/pages/site/docs/apis/i2ptunnel.html b/i2p2www/pages/site/docs/api/i2ptunnel.html
similarity index 100%
rename from i2p2www/pages/site/docs/apis/i2ptunnel.html
rename to i2p2www/pages/site/docs/api/i2ptunnel.html
diff --git a/i2p2www/pages/site/docs/apis/socks.html b/i2p2www/pages/site/docs/api/socks.html
similarity index 100%
rename from i2p2www/pages/site/docs/apis/socks.html
rename to i2p2www/pages/site/docs/api/socks.html
diff --git a/i2p2www/pages/site/docs/index.html b/i2p2www/pages/site/docs/index.html
index bd9fce6f..32ed553f 100644
--- a/i2p2www/pages/site/docs/index.html
+++ b/i2p2www/pages/site/docs/index.html
@@ -25,7 +25,7 @@ If you find any inaccuracies in the documents linked below, please
 <li><a href="{{ site_url('docs/how/intro') }}">A Less-Technical Introduction</a></li>
 <li><a href="{{ site_url('docs/how/threatmodel') }}">Threat model and analysis</a></li>
 <li><a href="{{ site_url('docs/how/networkcomparisons') }}">Comparisons to other anonymous networks</a></li>
-<li><a href="protocols.html">Protocol stack chart</a></li>
+<li><a href="{{ site_url('docs/protocols') }}">Protocol stack chart</a></li>
 <li><a href="papers.html">Papers and Presentations on I2P</a></li>
 <li><a href="{{ url_for('static', filename='pdf/i2p_philosophy.pdf') }}">Invisible Internet Project (I2P) Project Overview</a> August 28, 2003 (pdf)</li>
 </ul>
diff --git a/www.i2p2/pages/protocols.html b/i2p2www/pages/site/docs/protocols.html
similarity index 88%
rename from www.i2p2/pages/protocols.html
rename to i2p2www/pages/site/docs/protocols.html
index 7c382c89..b32a8831 100644
--- a/www.i2p2/pages/protocols.html
+++ b/i2p2www/pages/site/docs/protocols.html
@@ -1,10 +1,10 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Protocol Stack{% endblock %}
 {% block content %}
 
 <p>
 Here is the protocol stack for I2P.
-See also the <a href="how.html">Index to Technical Documentation</a>.
+See also the <a href="{{ site_url('docs/how') }}">Index to Technical Documentation</a>.
 Updated August 2010, current for router version 0.8.
 <p>
 
@@ -28,9 +28,9 @@ The capabilities are listed below, starting at the bottom of the protocol stack.
         <b>I2P Transport Layer:</b> provide encrypted connections between 2 I2P routers. These are not anonymous yet, this is strictly a hop-to-hop connection.
             Two protocols are implemented to provide these capabilities. NTCP builds on top of TCP, while SSU uses UDP.
         <br />
-        <a href="ntcp.html">NTCP</a>: NIO-based TCP
+        <a href="{{ site_url('docs/transport/ntcp') }}">NTCP</a>: NIO-based TCP
         <br />
-        <a href="udp.html">SSU</a>: Secure Semi-reliable UDP
+        <a href="{{ site_url('docs/transport/ssu') }}">SSU</a>: Secure Semi-reliable UDP
     </li>
     <li>
         <b>I2P Tunnel Layer:</b> provide full encrypted tunnel connections.
@@ -68,7 +68,7 @@ However, each of these layers adds additional functionality, to allow applicatio
     <li>
         <b>I2P Application Interface Layer:</b> additional (optional) libraries allowing easier implementations on top of I2P.
         <br />
-        <a href="i2ptunnel.html">I2PTunnel</a>
+        <a href="{{ site_url('docs/api/i2ptunnel') }}">I2PTunnel</a>
         <br />
         <a href="sam.html">SAM</a>/<a href="samv2.html">SAMv2</a>/<a href="samv3.html">SAMv3</a>(*),
         <a href="bob.html">BOB</a>        
@@ -76,7 +76,7 @@ However, each of these layers adds additional functionality, to allow applicatio
     <li>
         <b>I2P Application Proxy Layer:</b> proxy systems.
         <br />
-        HTTP Client/Server, IRC Client, <a href="socks.html">SOCKS</a>, Streamr 
+        HTTP Client/Server, IRC Client, <a href="{{ site_url('docs/api/socks') }}">SOCKS</a>, Streamr 
     </li>
   </ul>
 </p>
@@ -92,7 +92,7 @@ We can order this based on the I2P stack layer they use.
 </p>
 
     <div class="box" style="text-align:center;">
-        <img src="_static/images/protocol_stack.png" alt="I2P Network stack" title="I2P Network stack" />
+        <img src="{{ url_for('static', filename='images/protocol_stack.png') }}" alt="I2P Network stack" title="I2P Network stack" />
         <br /><br />
         Figure 1: The layers in the I2P Network stack.
     </div>