diff --git a/www.i2p2/pages/i2ptunnel.html b/i2p2www/pages/site/docs/apis/i2ptunnel.html
similarity index 99%
rename from www.i2p2/pages/i2ptunnel.html
rename to i2p2www/pages/site/docs/apis/i2ptunnel.html
index 643796f4..ebb16074 100644
--- a/www.i2p2/pages/i2ptunnel.html
+++ b/i2p2www/pages/site/docs/apis/i2ptunnel.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}i2ptunnel{% endblock %}
 {% block content %}Description of i2ptunnel and tunneling modes
 
@@ -138,4 +138,4 @@ the clients destination key as a hostname to the IRC-server.
 
 <h3 id="server-mode-streamr">Streamr</h3>
 A UDP-client that connects to a media server is created. The UDP-Client is coupled with a Streamr server I2PTunnel.
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/www.i2p2/pages/socks.html b/i2p2www/pages/site/docs/apis/socks.html
similarity index 91%
rename from www.i2p2/pages/socks.html
rename to i2p2www/pages/site/docs/apis/socks.html
index 97dd80a5..926189a1 100644
--- a/www.i2p2/pages/socks.html
+++ b/i2p2www/pages/site/docs/apis/socks.html
@@ -1,4 +1,4 @@
-{% extends "_layout.html" %}
+{% extends "global/layout.html" %}
 {% block title %}SOCKS{% endblock %}
 {% block content %}
 <h2>SOCKS and SOCKS proxies</h2>
@@ -10,7 +10,7 @@
 </p>
 <p>
 As it says on the
-<a href="faq.html#socks">FAQ</a>:
+<a href="{{ site_url('support/faq') }}#socks">FAQ</a>:
 <p>
     Many applications leak sensitive
     information that could identify you on the Internet. I2P only filters
@@ -53,9 +53,9 @@ Outproxy selection by port number is stubbed out.
 <ul>
 <li>
 The notes for
-<a href="meeting81.html">Meeting 81</a>
+<a href="{{ url_for('meetings_show', id=81) }}">Meeting 81</a>
 and
-<a href="meeting82.html">Meeting 82</a>
+<a href="{{ url_for('meetings_show', id=82) }}">Meeting 82</a>
 in March 2004.
 <li>
 <a href="http://www.abenteuerland.at/onioncat/">Onioncat</a>