diff --git a/www.i2p2/pages/monotone.html b/i2p2www/pages/site/develop/monotone.html
similarity index 99%
rename from www.i2p2/pages/monotone.html
rename to i2p2www/pages/site/develop/monotone.html
index 10797055..3baf9083 100644
--- a/www.i2p2/pages/monotone.html
+++ b/i2p2www/pages/site/develop/monotone.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Monotone{% endblock %}
 {% block content %}
 <h1>Monotone Guide</h1>
@@ -55,7 +55,7 @@
 <p>
   <i>This is a revised version of <a href="transition-guide.txt">Complication's original
   guide</a> detailing the use of Monotone in I2P development.
-  For basic instructions see the <a href="newdevelopers.html">quick-start guide</a>.</i>
+  For basic instructions see the <a href="{{ site_url('develop/newdevelopers') }}">quick-start guide</a>.</i>
 </p>
 
 <p>
@@ -65,7 +65,7 @@
   development work can be shared and merged cooperatively, and work that's
   considered satisfactory is eventually merged into a single trusted repository
   that serves as the project's master. In practice however, since contributors
-  are often given commit privileges (after signing the <a href="licenses.html#commit">developer
+  are often given commit privileges (after signing the <a href="{{ site_url('develop/licenses') }}#commit">developer
   agreement]</a>), it's more common for completed work to be
   pushed directly to the master repository by its original authors.
 </p>
diff --git a/www.i2p2/pages/team.html b/i2p2www/pages/site/team.html
similarity index 98%
rename from www.i2p2/pages/team.html
rename to i2p2www/pages/site/team.html
index 442e8cba..bac6282f 100644
--- a/www.i2p2/pages/team.html
+++ b/i2p2www/pages/site/team.html
@@ -1,11 +1,11 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Team{% endblock %}
 {% block content %}
 <h1>I2P Project Members</h1>
 <p>We are a small group of people spread around several continents, working to
 advance different aspects of the project and discussing the design of the
 network.
-<a href="getinvolved.html">Get involved!</a>
+<a href="{{ site_url('volunteer') }}">Get involved!</a>
 </p>
 
 <table border="0">
@@ -36,7 +36,7 @@ network.
 	<td valign="top"><i>manage the project mirrors</i></td>
 </tr>
 <tr>
-        <td valign="top"><b><a href="/monotone.html">Monotone</a> guru</b></td>
+        <td valign="top"><b><a href="{{ site_url('develop/monotone') }}">Monotone</a> guru</b></td>
         <td valign="top">welterde, eche|on</td>
         <td valign="top"><i>manage the public monotone repositories</i></td>
 </tr>
diff --git a/www.i2p2/pages/roadmap.html b/i2p2www/pages/site/volunteer/roadmap.html
similarity index 75%
rename from www.i2p2/pages/roadmap.html
rename to i2p2www/pages/site/volunteer/roadmap.html
index 1b4decfc..e79af448 100644
--- a/www.i2p2/pages/roadmap.html
+++ b/i2p2www/pages/site/volunteer/roadmap.html
@@ -1,11 +1,11 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Roadmap{% endblock %}
 {% block content %}
 
 <h2 id="v0.9">0.9</h2>
 <ul>
 <li>Include some seed data in the distribution so a central reseed location isn't required?</li>
-<li>Reachability Mapping / handle peers partially reachable / enhanced <a href="todo.html#fullRestrictedRoutes">restricted routes</a></li>
+<li>Reachability Mapping / handle peers partially reachable / enhanced <a href="{{ site_url('volunteer/todo') }}#fullRestrictedRoutes">restricted routes</a></li>
 <li>Improve help pages and website</li>
 <li>More translations</li>
 <li>SSU disconnect message</li>
@@ -30,5 +30,5 @@
 <li>User defined message delays</li>
 </ul>
 
-<p>Please see the <a href="todo">TODO</a> list for more detailed info about some of these tasks.</p>
+<p>Please see the <a href="{{ site_url('volunteer/todo') }}">TODO</a> list for more detailed info about some of these tasks.</p>
 {% endblock %}