diff --git a/build.xml b/build.xml
index 26179d59b..e558da99c 100644
--- a/build.xml
+++ b/build.xml
@@ -828,7 +828,7 @@
additionalparam="-notimestamp"
doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
-
+
diff --git a/router/java/src/com/southernstorm/noise/crypto/ChaChaCore.java b/core/java/src/com/southernstorm/noise/crypto/chacha20/ChaChaCore.java
similarity index 99%
rename from router/java/src/com/southernstorm/noise/crypto/ChaChaCore.java
rename to core/java/src/com/southernstorm/noise/crypto/chacha20/ChaChaCore.java
index 072905199..62d2053b6 100644
--- a/router/java/src/com/southernstorm/noise/crypto/ChaChaCore.java
+++ b/core/java/src/com/southernstorm/noise/crypto/chacha20/ChaChaCore.java
@@ -20,7 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*/
-package com.southernstorm.noise.crypto;
+package com.southernstorm.noise.crypto.chacha20;
/**
* Implementation of the ChaCha20 core hash transformation.
diff --git a/core/java/src/com/southernstorm/noise/crypto/chacha20/package.html b/core/java/src/com/southernstorm/noise/crypto/chacha20/package.html
new file mode 100644
index 000000000..88cce7077
--- /dev/null
+++ b/core/java/src/com/southernstorm/noise/crypto/chacha20/package.html
@@ -0,0 +1,8 @@
+
+
+ Noise ChaCha20 primitive, moved from com.southernstorm.noise.crypto (in router)
+ to com.southernstorm.noise.crypto.chacha20 (in core) in 0.9.39.
+
+ Since 0.9.39.
+
+
diff --git a/router/java/src/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java b/router/java/src/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
index 20a239d15..3c796ebd0 100644
--- a/router/java/src/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
+++ b/router/java/src/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
import javax.crypto.BadPaddingException;
import javax.crypto.ShortBufferException;
-import com.southernstorm.noise.crypto.ChaChaCore;
+import com.southernstorm.noise.crypto.chacha20.ChaChaCore;
import com.southernstorm.noise.crypto.Poly1305;
/**