diff --git a/www.i2p2/pages/ports.html b/i2p2www/pages/site/docs/ports.html
similarity index 92%
rename from www.i2p2/pages/ports.html
rename to i2p2www/pages/site/docs/ports.html
index 557746d0..22dcfd89 100644
--- a/www.i2p2/pages/ports.html
+++ b/i2p2www/pages/site/docs/ports.html
@@ -1,5 +1,7 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Ports Used by I2P{% endblock %}
+{% block lastupdated %}May 2012{% endblock %}
+{% block accuratefor %}0.9{% endblock %}
 {% block content %}
 
 <p>
@@ -7,10 +9,8 @@ These are the ports used or reserved by I2P, including those for known plugins,
 common alternates,
 and some typical related applications.
 <p>
-Updated May 2012, current for router version 0.9.
-<p>
 Note that many of these are not enabled by default.
-There is more information in <a href="faq.html#ports">the FAQ</a>.
+There is more information in <a href="{{ site_url('support/faq') }}#ports">the FAQ</a>.
 See also the documentation for individual plugins.
 Plugin authors please add any ports you use here.
 For new plugins, we recommend using the next available port
diff --git a/www.i2p2/pages/i2ptunnel_services.html b/i2p2www/pages/site/misc/i2ptunnel_services.html
similarity index 99%
rename from www.i2p2/pages/i2ptunnel_services.html
rename to i2p2www/pages/site/misc/i2ptunnel_services.html
index 507cdf2b..a9e9433a 100644
--- a/www.i2p2/pages/i2ptunnel_services.html
+++ b/i2p2www/pages/site/misc/i2ptunnel_services.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}i2ptunnel services{% endblock %}
 {% block content %}Below is quick copy of aum's eepsite deployment guide.
 <br />
diff --git a/www.i2p2/pages/jbigi.html b/i2p2www/pages/site/misc/jbigi.html
similarity index 96%
rename from www.i2p2/pages/jbigi.html
rename to i2p2www/pages/site/misc/jbigi.html
index 47747a4d..5a123c5b 100644
--- a/www.i2p2/pages/jbigi.html
+++ b/i2p2www/pages/site/misc/jbigi.html
@@ -1,9 +1,8 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}jbigi{% endblock %}
+{% block lastupdated %}August 2011{% endblock %}
+{% block accuratefor %}0.8.7{% endblock %}
 {% block content %}
-
-Updated August 2011, current as of router version 0.8.7
-
 <h2>Overview</h2>
 <p>Using JNI (Java Native Interface), a bit of C code (thanks ugha!), a little
 manual work and a piece of chewing gum we have made several
@@ -77,7 +76,7 @@ If your encrypt time is less than 50ms for a relatively new processor, or less t
 for an older processor, and the native BigInteger library was loaded, you are probably fine.
 </li>
 <li>Get the latest released source code of I2P from
-<a href="download.html">the download page</a>, or get the cutting-edge source
+<a href="{{ url_for('downloads_list', lang=g.lang) }}">the download page</a>, or get the cutting-edge source
 out of the monotone database mtn.i2p2.de</li>
 <li>Inside the source tree change directory to: <code>core/c/jbigi</code></li>
 <li>Read the README file.
diff --git a/www.i2p2/pages/manualwrapper.html b/i2p2www/pages/site/misc/manualwrapper.html
similarity index 95%
rename from www.i2p2/pages/manualwrapper.html
rename to i2p2www/pages/site/misc/manualwrapper.html
index b2c71411..3aba9b90 100644
--- a/www.i2p2/pages/manualwrapper.html
+++ b/i2p2www/pages/site/misc/manualwrapper.html
@@ -1,9 +1,9 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Manually Installing the Java Wrapper{% endblock %}
 {% block content %}
 <h1>Manually Installing the Java Wrapper</h1>
 
-<p>The installation package for the <a href="download">I2P router</a> comes
+<p>The installation package for the <a href="{{ url_for('downloads_list', lang=g.lang) }}">I2P router</a> comes
 with a Java wrapper for the most common architectures. If your system is not
 supported by our installer&mdash;or if you want to update the wrapper to a
 newer version&mdash;the following steps describe installing the wrapper manually.
diff --git a/www.i2p2/pages/minwww.html b/i2p2www/pages/site/misc/minwww.html
similarity index 99%
rename from www.i2p2/pages/minwww.html
rename to i2p2www/pages/site/misc/minwww.html
index 2fc32768..a4307741 100644
--- a/www.i2p2/pages/minwww.html
+++ b/i2p2www/pages/site/misc/minwww.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}minwww{% endblock %}
 {% block content %}<p>Here's an outline and rationale for a minimal WWW proxy app for use over
 I2P.</p>
@@ -100,4 +100,4 @@ size, but that's going to be going away since it involves either excessive memor
 overhead on intermediary routers, or additional implementation details to
 handle.  I2PTunnel is currently limited to 128KB and hasn't been a burden,
 so perhaps it could be increased to 256KB when the I2CP spec is updated)</p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/www.i2p2/pages/ratestats.html b/i2p2www/pages/site/misc/ratestats.html
similarity index 99%
rename from www.i2p2/pages/ratestats.html
rename to i2p2www/pages/site/misc/ratestats.html
index e51b0c01..83cd79b7 100644
--- a/www.i2p2/pages/ratestats.html
+++ b/i2p2www/pages/site/misc/ratestats.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}RateStat list{% endblock %}
 {% block content %}
 <h1>RateStat list</h1>