diff --git a/i2p2www/pages/site/docs/api/bob.html b/i2p2www/pages/site/docs/api/bob.html
index 853799541fc9f44cb62fe1c9a71ff7b26c075092..b8b315a9b3f85e787cf90fdfba5cf8b363523a48 100644
--- a/i2p2www/pages/site/docs/api/bob.html
+++ b/i2p2www/pages/site/docs/api/bob.html
@@ -4,9 +4,9 @@
 {% block content %}
 <h2>Language libraries for the BOB API</h2>
 <ul>
+<li>Go - <a href="https://bitbucket.org/kallevedin/ccondom">ccondom</a></li>
 <li>Python - <a href="http://{{ i2pconv('git.repo.i2p') }}/w/i2py-bob.git">i2py-bob</a></li>
 <li>Twisted - <a href="https://pypi.python.org/pypi/txi2p">txi2p</a></li>
-<li>Go - <a href="https://bitbucket.org/kallevedin/ccondom">ccondom</a></li>
 </ul>
 
 <h2>{% trans %}Technical differences from SAM (for the better?){% endtrans %}</h2>
diff --git a/i2p2www/pages/site/docs/api/sam.html b/i2p2www/pages/site/docs/api/sam.html
index 519d5e0c9e497c1789ce133cf043e32419e88a49..9fcea68d57d7b5c7e27b8d5f27f0da78d26833ae 100644
--- a/i2p2www/pages/site/docs/api/sam.html
+++ b/i2p2www/pages/site/docs/api/sam.html
@@ -11,16 +11,6 @@ Newer alternatives:
 <a href="{{ site_url('docs/api/bob') }}">BOB</a>.
 </p>
 
-<h3>I2P 0.9.14 Changes</h3>
-<p>
-The reported version remains "1.0".
-<ul>
-<li>DEST GENERATE now supports a SIGNATURE_TYPE parameter.
-<li>The MIN parameter in HELLO VERSION is now optional.
-<li>The MIN and MAX parameters in HELLO VERSION now support single-digit versions such as "3".
-</ul>
-</p>
-
 <h2>Language libraries for the SAMv1 API</h2>
 <ul>
 <li>C</li>
@@ -31,6 +21,16 @@ The reported version remains "1.0".
 
 The libraries are in the I2P source repository.
 
+<h3>I2P 0.9.14 Changes</h3>
+<p>
+The reported version remains "1.0".
+<ul>
+<li>DEST GENERATE now supports a SIGNATURE_TYPE parameter.
+<li>The MIN parameter in HELLO VERSION is now optional.
+<li>The MIN and MAX parameters in HELLO VERSION now support single-digit versions such as "3".
+</ul>
+</p>
+
 <h2>Version 1 Protocol</h2>
 <pre>
 ----------------------------------------------------------------------
diff --git a/i2p2www/pages/site/docs/api/samv3.html b/i2p2www/pages/site/docs/api/samv3.html
index 0c8a3570c438137ea0e097400364a3762de80f2d..80b18fd39223a1ca62948d65f62bf61ed731585b 100644
--- a/i2p2www/pages/site/docs/api/samv3.html
+++ b/i2p2www/pages/site/docs/api/samv3.html
@@ -13,6 +13,13 @@ Alternatives:
 <a href="{{ site_url('docs/api/bob') }}">BOB</a>.
 </p>
 
+<h2>Version 3 Language Libraries</h2>
+<ul>
+<li>C - <a href="http://git.repo.i2p/w/libsam3.git">libsam3</a></li>
+<li>Go - <a href="https://bitbucket.org/kallevedin/sam3">sam3</a>,
+         <a href="https://github.com/cryptix/goSam">goSam</a> (<a href="http://git.repo.i2p/w/goSam.git">in I2P</a>)</li>
+</ul>
+
 <h2>Version 3 Changes</h2>
 <h3>Version 3.0 Changes</h3>
 <p>
@@ -41,11 +48,6 @@ Version 3.1 was introduced in I2P release 0.9.14.
 </ul>
 </p>
 
-<h2>Version 3 Language Libraries</h2>
-<ul>
-<li>Go - <a href="https://bitbucket.org/kallevedin/sam3">sam3</a></li>
-</ul>
-
 <h2>Version 3 Protocol</h2>
 <pre>
 ----------------------------------------------------------------------