diff --git a/i2p2www/pages/site/get-involved/develop/licenses.html b/i2p2www/pages/site/get-involved/develop/licenses.html
index 8eaf19a7..3f97a277 100644
--- a/i2p2www/pages/site/get-involved/develop/licenses.html
+++ b/i2p2www/pages/site/get-involved/develop/licenses.html
@@ -94,7 +94,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
 	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">mihi</td>
+  <td valign="top" align="left">zzz</td>
  </tr>
  <tr>
   <td valign="top" align="left"><b>Streaming</b></td>
@@ -119,87 +119,16 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">mihi</td>
+  <td valign="top" align="left">zzz</td>
  </tr>
  <tr>
-  <td valign="top" align="left"><b>HTTPTunnel</b></td>
-
-  <td valign="top" align="left">apps/httptunnel</td>
-  <td valign="top" align="left">httptunnel.jar</td>
-  <td valign="top" align="left">
-	  <a href="#java_exception">GPL + exception</a></td>
-  <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
-    <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
-    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
-    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">mihi</td>
- </tr>
- <tr>
-  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM</a> Bridge</b></td>
-  <td valign="top" align="left">apps/sam</td>
-  <td valign="top" align="left">sam.jar</td>
-
+  <td valign="top" align="left"><b>Routerconsole</b></td>
+  <td valign="top" align="left">apps/routerconsole</td>
+  <td valign="top" align="left">routerconsole.war</td>
   <td valign="top" align="left">
 	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
-  <td valign="top" align="left">
-    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
-    <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
-    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">human</td>
- </tr>
- <tr>
-  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM</a> perl library</b></td>
-  <td valign="top" align="left">apps/sam/perl</td>
-  <td valign="top" align="left">SAM.pm</td>
-
-  <td valign="top" align="left">
-	  <a href="http://dev.perl.org/licenses/artistic.html">Artistic</a></td>
-  <td valign="top" align="left">
-    <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
-    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
-    <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
-    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">BrianR</td>
- </tr>
- <tr>
-  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM</a> C library</b></td>
-  <td valign="top" align="left">apps/sam/c</td>
-  <td valign="top" align="left">libSAM</td>
-
-  <td valign="top" align="left">
-	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a></td>
-  <td valign="top" align="left">
-    <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
-    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
-    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">Nightblade</td>
- </tr>
- <tr>
-  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM</a> Python library</b></td>
-  <td valign="top" align="left">apps/sam/python</td>
-  <td valign="top" align="left">i2p.py</td>
-
-  <td valign="top" align="left">
-          <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
-  <td valign="top" align="left">
-	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
-    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
-    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">Connelly</td>
- </tr>
- <tr>
-  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM</a> C# library</b></td>
-  <td valign="top" align="left">apps/sam/csharp/</td>
-  <td valign="top" align="left">n/a</td>
-
-  <td valign="top" align="left">
-          <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
-  <td valign="top" align="left">
-	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
-    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
-    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">smeghead</td>
+  <td valign="top" align="left">&nbsp;</td>
+  <td valign="top" align="left">zzz</td>
  </tr>
  <tr>
   <td valign="top" align="left"><b>Addressbook</b></td>
@@ -212,16 +141,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
     <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a></td>
-  <td valign="top" align="left">Ragnarok</td>
- </tr>
- <tr>
-  <td valign="top" align="left"><b>I2PSnark</b></td>
-  <td valign="top" align="left">apps/i2psnark</td>
-  <td valign="top" align="left">i2psnark.jar</td>
-  <td valign="top" align="left">
-	  <a href="#java_exception">GPL + exception</a></td>
   <td valign="top" align="left">&nbsp;</td>
-  <td valign="top" align="left">zzz</td>
  </tr>
  <tr>
   <td valign="top" align="left"><b>Susidns</b></td>
@@ -241,6 +161,91 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
   <td valign="top" align="left">&nbsp;</td>
   <td valign="top" align="left">&nbsp;</td>
  </tr>
+ <tr>
+  <td valign="top" align="left"><b>I2PSnark</b></td>
+  <td valign="top" align="left">apps/i2psnark</td>
+  <td valign="top" align="left">i2psnark.jar</td>
+  <td valign="top" align="left">
+	  <a href="#java_exception">GPL + exception</a></td>
+  <td valign="top" align="left">&nbsp;</td>
+  <td valign="top" align="left">zzz</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/bob') }}">BOB</a> Bridge</b></td>
+  <td valign="top" align="left">apps/BOB</td>
+  <td valign="top" align="left">BOB.jar</td>
+
+  <td valign="top" align="left">
+	  <a href="http://en.wikipedia.org/wiki/WTFPL">WTFPL</a></td>
+  <td valign="top" align="left">&nbsp;</td>
+  <td valign="top" align="left">sponge</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/samv3') }}">SAM</a> Bridge</b></td>
+  <td valign="top" align="left">apps/sam</td>
+  <td valign="top" align="left">sam.jar</td>
+
+  <td valign="top" align="left">
+	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+  <td valign="top" align="left">
+    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
+    <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
+    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
+  <td valign="top" align="left">zzz</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM v1</a> Perl library</b></td>
+  <td valign="top" align="left">apps/sam/perl</td>
+  <td valign="top" align="left">SAM.pm</td>
+
+  <td valign="top" align="left">
+	  <a href="http://dev.perl.org/licenses/artistic.html">Artistic</a></td>
+  <td valign="top" align="left">
+    <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
+    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
+    <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
+    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
+  <td valign="top" align="left">BrianR</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM v1</a> C library</b></td>
+  <td valign="top" align="left">apps/sam/c</td>
+  <td valign="top" align="left">libSAM</td>
+
+  <td valign="top" align="left">
+	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a></td>
+  <td valign="top" align="left">
+    <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a><br />
+    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
+    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
+  <td valign="top" align="left">Nightblade</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM v1</a> Python library</b></td>
+  <td valign="top" align="left">apps/sam/python</td>
+  <td valign="top" align="left">i2p.py</td>
+
+  <td valign="top" align="left">
+          <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+  <td valign="top" align="left">
+	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
+    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
+    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
+  <td valign="top" align="left">Connelly</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b><a href="{{ site_url('docs/api/sam') }}">SAM v1</a> C# library</b></td>
+  <td valign="top" align="left">apps/sam/csharp/</td>
+  <td valign="top" align="left">n/a</td>
+
+  <td valign="top" align="left">
+          <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+  <td valign="top" align="left">
+	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
+    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
+    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
+  <td valign="top" align="left">smeghead</td>
+ </tr>
  <tr>
   <td valign="top" align="left"><b>Other apps not mentioned</b></td>
   <td valign="top" align="left">apps/</td>