diff --git a/i2p2www/pages/global/footer.html b/i2p2www/pages/global/footer.html
index c646dcc9d9b584d1d98aae0e238cf187b8ed4587..602815c29cf316fd9a7204151b752f49ae404073 100644
--- a/i2p2www/pages/global/footer.html
+++ b/i2p2www/pages/global/footer.html
@@ -36,5 +36,5 @@
         </ul>
       </div>
       <div class='aside sixth'>
-        <a class='button' href='#donate'>Donate</a>
+        <a class='button' href="{{ site_url('volunteer/donate') }}">Donate</a>
       </div>
diff --git a/www.i2p2/pages/donate.html b/i2p2www/pages/site/volunteer/donate.html
similarity index 97%
rename from www.i2p2/pages/donate.html
rename to i2p2www/pages/site/volunteer/donate.html
index 5652ee67000826e7e997fec3486eb2e48709c72e..34af00cab8c02e30762eec2c9d275c0302d98e73 100644
--- a/www.i2p2/pages/donate.html
+++ b/i2p2www/pages/site/volunteer/donate.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Donate{% endblock %}
 {% block content %}<p>Thank you for your interest in contributing to I2P!
 The details of how you
@@ -91,5 +91,5 @@ as the envelope can be lost on the way to us. </p>
 <p>If you'd like to donate via  snail mail, send an email to <a href="mailto:echelon@i2pmail.org?subject=information about snailmail donation">echelon@i2pmail.org</a>
  and you'll receive an email with instructions detailing how to proceed.</p>
 
-<p>In the meantime, feel free to take a look at the generous donations that have been given in support of the I2P Project at the <a href="halloffame.html">hall of fame</a>.</p>
+<p>In the meantime, feel free to take a look at the generous donations that have been given in support of the I2P Project at the <a href="{{ site_url('volunteer/halloffame') }}">hall of fame</a>.</p>
 {% endblock %}
diff --git a/www.i2p2/pages/halloffame.html b/i2p2www/pages/site/volunteer/halloffame.html
similarity index 97%
rename from www.i2p2/pages/halloffame.html
rename to i2p2www/pages/site/volunteer/halloffame.html
index fd21c8cab89908c9b00b4abbdb428021dd138668..4d02f05ae4209b9124525421721f42276842d5f5 100644
--- a/www.i2p2/pages/halloffame.html
+++ b/i2p2www/pages/site/volunteer/halloffame.html
@@ -1,16 +1,16 @@
-{% extends "_layout.html" %}
-{% block title %}halloffame{% endblock %}
+{% extends "global/layout.html" %}
+{% block title %}Hall Of Fame{% endblock %}
 {% block content %}
 <!-- file version 2012.08.01.01 -->
 <h1>I2P'<small>s</small> Hall of Fame</h1>   
 <b>Current balance: as of 2012-08-01</b><br />
 <b>General fund: 3471,5 &euro; and 1528,65311242 BTC</b><br />
-<b><a href="bounty_datastore">Datastorage bounty</a>: 115.0 &euro; and 2 BTC</b><br />
-<b><a href="bounty_ipv6">native IPv6 I2P </a>: 100.0 &euro;</b><br />
-<b><a href="bounty_i2phex">I2PHex bounty</a>: 60.0 &euro;</b><br />
-<b><a href="bounty_debpack">I2P in debian mirrors</a>: 93.0 &euro;</b><br />
-<b><a href="bounty_btcclient">Bitcoin client for I2P</a>: 30.0 &euro; and 117.34 BTC</b><br />
-<b><a href="bounty_unittests">Unit Tests for I2P router</a>: 2700 &euro;</b><br />
+<b><a href="{{ site_url('volunteer/bounties/datastore') }}">Datastorage bounty</a>: 115.0 &euro; and 2 BTC</b><br />
+<b><a href="{{ site_url('volunteer/bounties/ipv6') }}">native IPv6 I2P </a>: 100.0 &euro;</b><br />
+<b><a href="{{ site_url('volunteer/bounties/i2phex') }}">I2PHex bounty</a>: 60.0 &euro;</b><br />
+<b><a href="{{ site_url('volunteer/bounties/debpack') }}">I2P in debian mirrors</a>: 93.0 &euro;</b><br />
+<b><a href="{{ site_url('volunteer/bounties/btcclient') }}">Bitcoin client for I2P</a>: 30.0 &euro; and 117.34 BTC</b><br />
+<b><a href="{{ site_url('volunteer/bounties/unittests') }}">Unit Tests for I2P router</a>: 2700 &euro;</b><br />
 <br />
 <b>Current monthly running costs:</b><br />
 <table border="1">