diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
index e58fa41b..2ed8a611 100644
--- a/i2p2www/pages/global/footer.html
+++ b/i2p2www/pages/global/footer.html
@@ -8,8 +8,8 @@
       <div class='aside second'>
         <h1>{{ _('About I2P') }}</h1>
         <ul>
-          <li><a href="{{ site_url('team') }}">{{ _('I2P Team') }}</a></li>
-          <li><a href="halloffame.html">{{ _('Hall of Fame') }}</a></li>
+          <li><a href="{{ site_url('volunteer/team') }}">{{ _('I2P Team') }}</a></li>
+          <li><a href="{{ site_url('volunteer/halloffame') }}">{{ _('Hall of Fame') }}</a></li>
         </ul>
       </div>
       <div class='aside third'>
diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 141118b4..61715439 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -30,9 +30,11 @@
   </li>
   <li class="has-sub"><a href="{{ site_url('volunteer') }}"><span>{{ _('Volunteer') }}</span></a>
     <ul>
+      <li><a href="{{ site_url('volunteer/team') }}"><span>{{ _('Team') }}</span></a></li>
+      <li><a href="{{ site_url('volunteer/halloffame') }}"><span>{{ _('Hall of Fame') }}</span></a></li>
       <li><a href="{{ site_url('volunteer/bounties') }}"><span>{{ _('Bounties') }}</span></a></li>
-      <li><a href="roadmap.html"><span>{{ _('Roadmap') }}</span></a></li>
-      <li><a href="todo.html"><span>{{ _('Task list') }}</span></a></li>
+      <li><a href="{{ site_url('volunteer/roadmap') }}"><span>{{ _('Roadmap') }}</span></a></li>
+      <li><a href="{{ site_url('volunteer/todo') }}"><span>{{ _('Task list') }}</span></a></li>
     </ul>
   </li>
   <li class="has-sub right"><a href="#"><span>{{ _('Language') }}</span></a>
diff --git a/i2p2www/pages/site/team.html b/i2p2www/pages/site/volunteer/team.html
similarity index 100%
rename from i2p2www/pages/site/team.html
rename to i2p2www/pages/site/volunteer/team.html
diff --git a/www.i2p2/pages/todo.html b/i2p2www/pages/site/volunteer/todo.html
similarity index 98%
rename from www.i2p2/pages/todo.html
rename to i2p2www/pages/site/volunteer/todo.html
index a702dfeb..6c8d53a3 100644
--- a/www.i2p2/pages/todo.html
+++ b/i2p2www/pages/site/volunteer/todo.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}To Do List{% endblock %}
 {% block content %}
   <h1>I2P Project Targets</h1>
@@ -8,8 +8,8 @@
     or tools to secure the local machine, nor does it include client applications 
     that will be essential in I2P's success. There are probably other things that 
     will come up, especially as I2P gets more peer review, but these are the main 
-    'big things'. See also <a href="roadmap.html">the roadmap</a>. Want to help? 
-    <a href="getinvolved.html">Get involved</a>! </p>
+    'big things'. See also <a href="{{ site_url('volunteer/roadmap') }}">the roadmap</a>. Want to help? 
+    <a href="{{ site_url('volunteer') }}">Get involved</a>! </p>
   <br />
   <h2>Core functionality <span class="permalink"><a href="#core">[link]</a></span></h2>
   <ul class="targetlist">
@@ -112,7 +112,7 @@
       <p>Obviously, that just won't work. We need to use a transport layer that 
         can scale. In Java, we have two main camps:</p>
       <h4>UDP</h4>
-      <b><i>Implemented in I2P 0.6 ("SSU") as documented <a href="udp.html">elsewhere</a></i></b> 
+      <b><i>Implemented in I2P 0.6 ("SSU") as documented <a href="{{ site_url('docs/transport/ssu') }}">elsewhere</a></i></b> 
       <p>Sending and receiving UDP datagrams is a connectionless operation - if 
         we are communicating with 100,000 peers, we simply stick the UDP packets 
         in a queue and have a single thread pulling them off the queue and shoving