diff --git a/www.i2p2/pages/old/clt.html b/i2p2www/pages/site/misc/clt.html
similarity index 96%
rename from www.i2p2/pages/old/clt.html
rename to i2p2www/pages/site/misc/clt.html
index 0532fdeee22209d3f718e8cb4e029338d23bc9d7..9a529f74dfdbd31ba7d761efd50a39f81c766d15 100644
--- a/www.i2p2/pages/old/clt.html
+++ b/i2p2www/pages/site/misc/clt.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
{% block title %}I2P at CLT and PetCon 2009.1{% endblock %}
{% block content %}<p>Members of I2P will held a talk at CLT and PetCon 2009.1</p>
Two members of the I2P team will be at two forthcoming Linux day and security convention. </ br>
diff --git a/www.i2p2/pages/old/cvs.html b/i2p2www/pages/site/misc/cvs.html
similarity index 88%
rename from www.i2p2/pages/old/cvs.html
rename to i2p2www/pages/site/misc/cvs.html
index 26f93a9fb0c20ea8cd6cbf65e4c8e267eb910921..52365d9d98f7de6c6865f10937efb7e19f7a2207 100644
--- a/www.i2p2/pages/old/cvs.html
+++ b/i2p2www/pages/site/misc/cvs.html
@@ -1,6 +1,6 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
{% block title %}CVS{% endblock %}
-{% block content %}<p>The I2P sourcecode was kept in a CVS repository. Nowadays it is kept in an <a href="monotone.html">Monotone</a> repository.
+{% block content %}<p>The I2P sourcecode was kept in a CVS repository. Nowadays it is kept in an <a href="{{ site_url('volunteer/develop/monotone') }}">Monotone</a> repository.
For those who aren't very familiar with CVS, there is a
<a href="http://cvsbook.red-bean.com/cvsbook.html">fantastic book</a> on the
subject (developers only need to deal with the first chapter - "An Overview of
diff --git a/www.i2p2/pages/old/i2ptunnel_migration.html b/i2p2www/pages/site/misc/i2ptunnel_migration.html
similarity index 97%
rename from www.i2p2/pages/old/i2ptunnel_migration.html
rename to i2p2www/pages/site/misc/i2ptunnel_migration.html
index 888ce4ab7fed2620338b05cde18224fe02b17f4c..0c5fa751ce3564c489106bc1e4cfaa6e712134e7 100644
--- a/www.i2p2/pages/old/i2ptunnel_migration.html
+++ b/i2p2www/pages/site/misc/i2ptunnel_migration.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
{% block title %}i2ptunnel migration{% endblock %}
{% block content %}<h3>I2PTunnel migration:</h3>
@@ -41,4 +41,4 @@ existing tunnels and rebuild new ones)</p>
into the network before you are able to use the /i2ptunnel/ web
interface. It will say "Please be patient" if you try to
beforehand, which means that it is still trying to build the
-necessary I2PTunnel sessions it has been configured to create. </p>{% endblock %}
\ No newline at end of file
+necessary I2PTunnel sessions it has been configured to create. </p>{% endblock %}
diff --git a/i2p2www/pages/site/misc/invisiblenet.html b/i2p2www/pages/site/misc/invisiblenet.html
new file mode 100644
index 0000000000000000000000000000000000000000..5c2c7a103c0985568adb68362d104b0253c30fc3
--- /dev/null
+++ b/i2p2www/pages/site/misc/invisiblenet.html
@@ -0,0 +1,23 @@
+{% extends "global/layout.html" %}
+{% block title %}Old Documents{% endblock %}
+{% block content %}
+
+Following is a list of documents originally on www.invisiblenet.net/i2p/ and
+rescued via the
+<a href="http://www.archive.org/">Wayback Machine</a>.
+They are quite dated and may or may not be accurate.
+However, the I2CP and I2NP documents in particular have some good information.
+
+
+<H3>Index of /i2p</H3>
+<PRE>Name Last modified Size
+<HR>
+<A HREF="{{ url_for('static', filename='pdf/I2CP_spec.pdf') }}">I2CP_spec.pdf</A> 03-Sep-2003 12:49 119k
+<A HREF="{{ url_for('static', filename='pdf/I2NP_spec.pdf') }}">I2NP_spec.pdf</A> 03-Sep-2003 12:49 356k
+<A HREF="{{ url_for('static', filename='pdf/datastructures.pdf') }}">datastructures.pdf</A> 03-Sep-2003 12:49 149k
+<A HREF="{{ url_for('static', filename='pdf/i2p_philosophy.pdf') }}">i2p_philosophy.pdf</A> 03-Sep-2003 12:52 126k
+<A HREF="{{ url_for('static', filename='pdf/polling_http_transport.pdf') }}">polling_http_transpo..></A> 03-Sep-2003 12:49 189k
+</PRE>
+
+
+{% endblock %}
diff --git a/www.i2p2/pages/old/jrandom-awol.html b/i2p2www/pages/site/misc/jrandom-awol.html
similarity index 98%
rename from www.i2p2/pages/old/jrandom-awol.html
rename to i2p2www/pages/site/misc/jrandom-awol.html
index 5ca4aff91544f2c5f82da9d11b608d907a474891..a5ea40c6bd5326cf33a1aa4f6a9248b54d0ac7df 100644
--- a/www.i2p2/pages/old/jrandom-awol.html
+++ b/i2p2www/pages/site/misc/jrandom-awol.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
{% block title %}Jrandom's Announcement{% endblock %}
{% block content %}
The following message was received in mid-November 2007. We have no further information
diff --git a/www.i2p2/pages/old/myi2p.html b/i2p2www/pages/site/misc/myi2p.html
similarity index 86%
rename from www.i2p2/pages/old/myi2p.html
rename to i2p2www/pages/site/misc/myi2p.html
index 4daf83c271563ca101f2362e5de319ee89c459f3..e78b1b931fbf26b45904064fc2493699ab1bf046 100644
--- a/www.i2p2/pages/old/myi2p.html
+++ b/i2p2www/pages/site/misc/myi2p.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
{% block title %}MYI2P{% endblock %}
{% block content %}<p>There has been discussion about a distributed blogging application for a few
months now called "MyI2P". While the original discussions were lost, we were
@@ -8,7 +8,7 @@ that ensued.</p>
<p>The application itself is not yet implemented, and the ideas behind it have
been made less ambitious over time, but they are still valid and the current
-<a href="roadmap">plan</a> is to have the core MyI2P functionality available
+<a href="{{ site_url('volunteer/roadmap') }}">plan</a> is to have the core MyI2P functionality available
along side the I2P 1.0 release. That will include a distributed address book
to enable secure, distributed, and human readable naming by sacrificing the
need for global uniqueness - basically everyone has their own local address book
@@ -19,7 +19,7 @@ system using a reduced and secured subset of
<a href="http://www.phpbb.com/phpBB/faq.php?mode=bbcode">bbcode</a> to essentially
provide an anonymous <a href="http://www.livejournal.com/">LiveJournal</a> with
a 'friends list' and transparent access control (authenticated by the I2P
-<a href="datagrams">datagrams</a> with rules defined based on the address book).</p>
+<a href="{{ site_url{'docs/spec/datagrams') }}">datagrams</a> with rules defined based on the address book).</p>
<p>Additional functionality, such as integration with a DHT backing store or
swarming file transfers for 'attachments' can be added later. Email may or may
@@ -27,4 +27,4 @@ not get in the first pass either, though its implementation is essentially just
a blog entry with private access, so perhaps some UI designer can come up with
something. Exporting the data to RSS or access through ATOM will be an option
down the road as well.</p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/www.i2p2/pages/old/transition-guide.html b/i2p2www/pages/site/misc/transition-guide.html
similarity index 80%
rename from www.i2p2/pages/old/transition-guide.html
rename to i2p2www/pages/site/misc/transition-guide.html
index 0f10d1c885424515dc36f378c20a8c5759eeecbb..4480f02d0e20fd98ab706bc7f64b5154a05b8f03 100644
--- a/www.i2p2/pages/old/transition-guide.html
+++ b/i2p2www/pages/site/misc/transition-guide.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
{% block title %}Monotone{% endblock %}
{% block content %}<p>The I2P sourcecode is kept in several distributed monotone repositories.
See the
@@ -8,7 +8,7 @@ See
<a href="http://forum.i2p/viewtopic.php?t=2524">this forum post on i2p monotone</a>
for more information on how to get started and check out the source anonymously.
There is also a quick-start guide on the
-<a href="newdevelopers.html">new developer's page</a>.
+<a href="{{ site_url('volunteer/guides/newdevelopers') }}">new developer's page</a>.
</p>
<p>
@@ -21,7 +21,7 @@ The i2p source code branch is "i2p.i2p".
The following is a detailed guide by Complication.
</p>
<pre>
- {% include "transition-guide.txt" %}
+ {% include "site/misc/transition-guide.txt" %}
</pre>
{% endblock %}
diff --git a/www.i2p2/pages/old/transition-guide.txt b/i2p2www/pages/site/misc/transition-guide.txt
similarity index 100%
rename from www.i2p2/pages/old/transition-guide.txt
rename to i2p2www/pages/site/misc/transition-guide.txt
diff --git a/www.i2p2/pages/old/upgrade-0.6.1.30.html b/i2p2www/pages/site/misc/upgrade-0.6.1.30.html
similarity index 93%
rename from www.i2p2/pages/old/upgrade-0.6.1.30.html
rename to i2p2www/pages/site/misc/upgrade-0.6.1.30.html
index 5adc7362be6d54a443debcffcb38f94114895e6a..0d5b3e2cf00846bb9acee3909afba3618da7e4a3 100644
--- a/www.i2p2/pages/old/upgrade-0.6.1.30.html
+++ b/i2p2www/pages/site/misc/upgrade-0.6.1.30.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
{% block title %}How to Upgrade from 0.6.1.30 and Earlier{% endblock %}
{% block content %}
<p>
@@ -6,7 +6,7 @@
2008-02-05: <b>Upgrading from 0.6.1.30 and Earlier Releases</b>
</p><p>
Since i2p's lead developer
-<a href="jrandom-awol.html">has gone AWOL</a>,
+<a href="{{ site_url('misc/jrandom-awol') }}">has gone AWOL</a>,
we do not have his update signing key or access to
www.i2p[.net] or dev.i2p[.net].
Complication and zzz have generated new signing keys, and they and Amiga are providing
@@ -18,7 +18,7 @@ the latest release.
We recommend the automated process as it will verify the key of the signed update file.
If you do not make these changes,
you may manually download the i2pupdate.zip file from
-<a href="download.html">the download page</a>.
+<a href="{{ url_for('downloads_list', lang=g.lang) }}">the download page</a>.
<ol><li>
On
<a href="http://localhost:7657/configupdate.jsp">configupdate.jsp</a>:
diff --git a/www.i2p2/pages/old/invisiblenet.html b/www.i2p2/pages/old/invisiblenet.html
deleted file mode 100644
index de48244f0ccb739e8f265e854876ed0f81234037..0000000000000000000000000000000000000000
--- a/www.i2p2/pages/old/invisiblenet.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "_layout.html" %}
-{% block title %}Old Documents{% endblock %}
-{% block content %}
-
-Following is a list of documents originally on www.invisiblenet.net/i2p/ and
-rescued via the
-<a href="http://www.archive.org/">Wayback Machine</a>.
-They are quite dated and may or may not be accurate.
-However, the I2CP and I2NP documents in particular have some good information.
-
-
-<H3>Index of /i2p</H3>
-<PRE>Name Last modified Size
-<HR>
-<A HREF="/_static/pdf/I2CP_spec.pdf">I2CP_spec.pdf</A> 03-Sep-2003 12:49 119k
-<A HREF="/_static/pdf/I2NP_spec.pdf">I2NP_spec.pdf</A> 03-Sep-2003 12:49 356k
-<A HREF="/_static/pdf/datastructures.pdf">datastructures.pdf</A> 03-Sep-2003 12:49 149k
-<A HREF="/_static/pdf/i2p_philosophy.pdf">i2p_philosophy.pdf</A> 03-Sep-2003 12:52 126k
-<A HREF="/_static/pdf/polling_http_transport.pdf">polling_http_transpo..></A> 03-Sep-2003 12:49 189k
-</PRE>
-
-
-{% endblock %}