diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html
index 07f6d06c..76355819 100644
--- a/i2p2www/pages/global/nav.html
+++ b/i2p2www/pages/global/nav.html
@@ -67,6 +67,8 @@
           <li><a href="{{ site_url('docs/specs/updates') }}"><span>{{ _('Software updates') }}</span></a></li>
         </ul>
       </li>
+      <li><a href="{{ site_url('docs/naming') }}"><span>{{ _('Naming and addressbook') }}</span></a></li>
+      <li><a href="{{ site_url('docs/plugins') }}"><span>{{ _('Plugins') }}</span></a></li>
       <li><a href="{{ site_url('docs/papers') }}"><span>{{ _('Papers and presentations') }}</span></a></li>
     </ul>
   </li>
diff --git a/www.i2p2/pages/naming.html b/i2p2www/pages/site/docs/naming.html
similarity index 95%
rename from www.i2p2/pages/naming.html
rename to i2p2www/pages/site/docs/naming.html
index 5635ee3b..9c55107a 100644
--- a/www.i2p2/pages/naming.html
+++ b/i2p2www/pages/site/docs/naming.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Naming and Addressbook{% endblock %}
 {% block content %}
 <h1>Naming in I2P</h1>
@@ -28,7 +28,7 @@ traditional DNS.
 
 <p>
 NOTE: For the reasoning behind the I2P naming system, common arguments against it
-and possible alternatives see the <a href="naming_discussion.html">naming discussion</a>
+and possible alternatives see the <a href="{{ site_url('docs/discussions/naming') }}">naming discussion</a>
 page.
 </p>
 
@@ -62,7 +62,7 @@ for addressbook configuration and viewing of the local host lists.
 All destinations in I2P are 516-byte (or longer) keys.
 (To be more precise, it is a 256-byte public key plus a 128-byte signing key
 plus a null certificate, which in Base64 representation is 516 bytes.
-<a href="naming_discussion.html#certificates">Certificates</a> are not used now,
+<a href="{{ site_url('docs/discussions/naming') }}#certificates">Certificates</a> are not used now,
 if they are, the keys will be longer.
 One possible use of certificates is for <a href="todo.html#hashcash">proof of work</a>.)
 </p><p>
@@ -84,7 +84,7 @@ There is no enforcement of naming rules in lookups.
 Lookups are cached for a few minutes.
 There is an experimental facility for real-time lookups (a la DNS) over the network within the router,
 although it is not enabled by default
-(see "EepGet" under <a href="naming_discussion.html#alternatives">Alternatives on the discussion page</a>).
+(see "EepGet" under <a href="{{ site_url('docs/discussions/naming') }}#alternatives">Alternatives on the discussion page</a>).
 </p>
 
 <h2 id="httpproxy">HTTP Proxy</h2>
@@ -124,8 +124,8 @@ local addressbook application (via subscriptions.txt or <a href="#susidns">SusiD
 Some other public addressbook subscription links:
 </p>
 <ul>
-<li><a href="http://i2host.i2p/cgi-bin/i2hostetag">http://i2host.i2p/cgi-bin/i2hostetag</a>
-<li><a href="http://stats.i2p/cgi-bin/newhosts.txt">http://stats.i2p/cgi-bin/newhosts.txt</a>
+<li><a href="http://{{ i2pconv('i2host.i2p') }}/cgi-bin/i2hostetag">http://i2host.i2p/cgi-bin/i2hostetag</a>
+<li><a href="http://{{ i2pconv('stats.i2p') }}/cgi-bin/newhosts.txt">http://stats.i2p/cgi-bin/newhosts.txt</a>
 </ul>
 <p>
 The operators of these services may have various policies for listing hosts.
diff --git a/www.i2p2/pages/plugins.html b/i2p2www/pages/site/docs/plugins.html
similarity index 89%
rename from www.i2p2/pages/plugins.html
rename to i2p2www/pages/site/docs/plugins.html
index d0fb900c..cc4ef7fa 100644
--- a/www.i2p2/pages/plugins.html
+++ b/i2p2www/pages/site/docs/plugins.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}Plugins{% endblock %}
 {% block content %}
 <h2>I2P Plugins</h2>
@@ -38,7 +38,7 @@ version, and previous installed application version</li>
 <li>Automatic startup of application, including modifying classpath, without requiring a restart</li>
 <li>Automatic integration and startup of webapps into console Jetty instance</li>
 <li>Facilitate creation of 'app stores' like the one at <a
-    href="http://plugins.i2p">plugins.i2p</a></li>
+    href="http://{{ i2pconv('plugins.i2p') }}">plugins.i2p</a></li>
 <li> One-click uninstall</li>
 <li> Language and theme packs for the console </li>
 <li> Bring detailed application information to the router console </li>
@@ -66,10 +66,10 @@ builds).</p>
 
 
 <h3>Development</h3>
-<p> See the latest <a href="plugin_spec">plugin specification</a> and the <a
-    href="http://zzz.i2p/forums/16">plugin forum</a> on zzz.i2p.  </p> <p> See
+<p> See the latest <a href="{{ site_url('docs/specs/plugin') }}">plugin specification</a> and the <a
+    href="http://{{ i2pconv('zzz.i2p') }}/forums/16">plugin forum</a> on zzz.i2p.  </p> <p> See
 also the sources for plugins developed by various people.  Some plugins, such
-as <a href="http://plugins.i2p/plugins/snowman">snowman</a>, were developed
+as <a href="http://{{ i2pconv('plugins.i2p') }}/plugins/snowman">snowman</a>, were developed
 specifically as examples.  </p>
 
 <p> <b>Developers wanted!</b> Plugins are a great way to learn more about I2P
@@ -78,7 +78,7 @@ or easily add some feature.  </p>
 <h3>Getting Started</h3>
 <p> To create a plugin from an existing binary package you will need to get
 makeplugin.sh from <a
-    href="http://trac.i2p2.de/browser/plugin/makeplugin.sh?rev=776519571fda0689ef09c42f66e7398f30432e87">the
+    href="http://{{ i2pconv('trac.i2p2.i2p') }}/browser/plugin/makeplugin.sh?rev=776519571fda0689ef09c42f66e7398f30432e87">the
     i2p.scripts branch in monotone</a>.  </p>