diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index c6252046..0cc07eaf 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -114,6 +114,7 @@
   </li>
   <li class="has-sub"><a href="#"><span>{{ _('About') }}</span></a>
     <ul>
+      <li><a href="{{ site_url('about/intro') }}"><span>{{ _('Introduction to I2P') }}</span></a></li>
       <li><a href="{{ site_url('about/team') }}"><span>{{ _('Team') }}</span></a></li>
       <li><a href="{{ site_url('about/halloffame') }}"><span>{{ _('Hall of Fame') }}</span></a></li>
       <li><a href="{{ site_url('about/papers') }}"><span>{{ _('Papers and presentations') }}</span></a></li>
diff --git a/www.i2p2/pages/intro.html b/i2p2www/pages/site/about/intro.html
similarity index 82%
rename from www.i2p2/pages/intro.html
rename to i2p2www/pages/site/about/intro.html
index 3af01ef8..24c6bf18 100644
--- a/www.i2p2/pages/intro.html
+++ b/i2p2www/pages/site/about/intro.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Intro{% endblock %}
 {% block content %}
 <h1>The Invisible Internet Project (I2P)</h1>      
@@ -15,7 +15,7 @@ are cryptographic identifiers (essentially a pair of <a href="http://en.wikipedi
 <h2>How does it work?</h2>
 
 <p>To anonymize the messages sent, each client application has their I2P "router"
-build a few inbound and outbound "<a href="how_tunnelrouting.html">tunnels</a>" - a 
+build a few inbound and outbound "<a href="{{ site_url('docs/how/tunnelrouting') }}">tunnels</a>" - a 
 sequence of peers that pass messages in one direction (to and from the client, 
 respectively).  In turn, when a client wants to send a message to another client, 
 the client passes that message out one of their outbound tunnels targeting one of the 
@@ -27,7 +27,7 @@ message is the absolute minimum necessary to meet both the sender's and the
 receiver's threat model.</p>
 
 <p>The first time a client wants to contact another client, they make a query 
-against the fully distributed "<a href="how_networkdatabase.html">network 
+against the fully distributed "<a href="{{ site_url('docs/how/networkdatabase') }}">network 
 database</a>" - a custom structured <a href="http://en.wikipedia.org/wiki/Distributed_hash_table">
 distributed hash table (DHT)</a> based off the 
 <a href="http://en.wikipedia.org/wiki/Kademlia"> Kademlia algorithm</a>. This is done 
@@ -35,7 +35,7 @@ to find the other client's inbound tunnels efficiently, but subsequent messages
 between them usually includes that data so no further network database lookups 
 are required.</p>
   
-<p>More details about how I2P works are <a href="how.html">available</a>.</p>
+<p>More details about how I2P works are <a href="{{ site_url('docs') }}">available</a>.</p>
 
 <h2>What can you do with it?</h2>
 
@@ -43,7 +43,7 @@ are required.</p>
 communicate - those that typically use UDP can make use of the base I2P 
 functionality, and those that typically use TCP can use the TCP-like streaming
 library.  We have a generic TCP/I2P bridge application 
-("<a href="i2ptunnel.html">I2PTunnel</a>") that enables people to forward TCP streams
+("<a href="{{ site_url('docs/api/i2ptunnel') }}">I2PTunnel</a>") that enables people to forward TCP streams
 into the I2P network as well as to receive streams out of the network and 
 forward them towards a specific TCP/IP address.</p>
 
@@ -73,14 +73,14 @@ not viable in the long run for several reasons (including the cost of running
 one as well as the anonymity and security issues they introduce), but in 
 certain circumstances the technique could be appropriate.</p>
 
-<p>The I2P development <a href="team.html">team</a> is an open group, welcome to all 
-who are interested in <a href="getinvolved.html">getting involved</a>, and all of 
-the code is <a href="licenses.html">open source</a>.  The core I2P SDK and the 
+<p>The I2P development <a href="{{ site_url('about/team') }}">team</a> is an open group, welcome to all 
+who are interested in <a href="{{ site_url('volunteer') }}">getting involved</a>, and all of 
+the code is <a href="{{ site_url('volunteer/develop/licenses') }}">open source</a>.  The core I2P SDK and the 
 current router implementation is done in Java (currently working with both 
 sun and kaffe, gcj support planned for later), and there is a 
-<a href="sam.html">simple socket based API</a> for accessing the network from 
+<a href="{{ site_url('docs/api/sam') }}">simple socket based API</a> for accessing the network from 
 other languages (with a C library available, and both Python and Perl in 
 development).  The network is actively being developed and has not yet reached 
-the 1.0 release, but the current <a href="roadmap.html">roadmap</a> describes 
+the 1.0 release, but the current <a href="{{ site_url('volunteer/roadmap') }}">roadmap</a> describes 
 our schedule.</p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}