diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a08e708
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <artifactId>noise-java</artifactId>
+    <groupId>com.southerstorm</groupId>
+    <version>1.0-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
+
+</project>
diff --git a/NoiseJava/.gitignore b/src/.gitignore
similarity index 100%
rename from NoiseJava/.gitignore
rename to src/.gitignore
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/Blake2bMessageDigest.java b/src/main/java/com/southernstorm/noise/crypto/Blake2bMessageDigest.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/Blake2bMessageDigest.java
rename to src/main/java/com/southernstorm/noise/crypto/Blake2bMessageDigest.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/Blake2sMessageDigest.java b/src/main/java/com/southernstorm/noise/crypto/Blake2sMessageDigest.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/Blake2sMessageDigest.java
rename to src/main/java/com/southernstorm/noise/crypto/Blake2sMessageDigest.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/ChaChaCore.java b/src/main/java/com/southernstorm/noise/crypto/ChaChaCore.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/ChaChaCore.java
rename to src/main/java/com/southernstorm/noise/crypto/ChaChaCore.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/Curve25519.java b/src/main/java/com/southernstorm/noise/crypto/Curve25519.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/Curve25519.java
rename to src/main/java/com/southernstorm/noise/crypto/Curve25519.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/Curve448.java b/src/main/java/com/southernstorm/noise/crypto/Curve448.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/Curve448.java
rename to src/main/java/com/southernstorm/noise/crypto/Curve448.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/GHASH.java b/src/main/java/com/southernstorm/noise/crypto/GHASH.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/GHASH.java
rename to src/main/java/com/southernstorm/noise/crypto/GHASH.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/NewHope.java b/src/main/java/com/southernstorm/noise/crypto/NewHope.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/NewHope.java
rename to src/main/java/com/southernstorm/noise/crypto/NewHope.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/NewHopeTor.java b/src/main/java/com/southernstorm/noise/crypto/NewHopeTor.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/NewHopeTor.java
rename to src/main/java/com/southernstorm/noise/crypto/NewHopeTor.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/Poly1305.java b/src/main/java/com/southernstorm/noise/crypto/Poly1305.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/Poly1305.java
rename to src/main/java/com/southernstorm/noise/crypto/Poly1305.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/RijndaelAES.java b/src/main/java/com/southernstorm/noise/crypto/RijndaelAES.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/RijndaelAES.java
rename to src/main/java/com/southernstorm/noise/crypto/RijndaelAES.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/SHA256MessageDigest.java b/src/main/java/com/southernstorm/noise/crypto/SHA256MessageDigest.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/SHA256MessageDigest.java
rename to src/main/java/com/southernstorm/noise/crypto/SHA256MessageDigest.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/SHA512MessageDigest.java b/src/main/java/com/southernstorm/noise/crypto/SHA512MessageDigest.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/SHA512MessageDigest.java
rename to src/main/java/com/southernstorm/noise/crypto/SHA512MessageDigest.java
diff --git a/NoiseJava/src/com/southernstorm/noise/crypto/package-info.java b/src/main/java/com/southernstorm/noise/crypto/package-info.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/crypto/package-info.java
rename to src/main/java/com/southernstorm/noise/crypto/package-info.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java b/src/main/java/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java
rename to src/main/java/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java b/src/main/java/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java
rename to src/main/java/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java b/src/main/java/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
rename to src/main/java/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/CipherState.java b/src/main/java/com/southernstorm/noise/protocol/CipherState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/CipherState.java
rename to src/main/java/com/southernstorm/noise/protocol/CipherState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/CipherStatePair.java b/src/main/java/com/southernstorm/noise/protocol/CipherStatePair.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/CipherStatePair.java
rename to src/main/java/com/southernstorm/noise/protocol/CipherStatePair.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/Curve25519DHState.java b/src/main/java/com/southernstorm/noise/protocol/Curve25519DHState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/Curve25519DHState.java
rename to src/main/java/com/southernstorm/noise/protocol/Curve25519DHState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/Curve448DHState.java b/src/main/java/com/southernstorm/noise/protocol/Curve448DHState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/Curve448DHState.java
rename to src/main/java/com/southernstorm/noise/protocol/Curve448DHState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/DHState.java b/src/main/java/com/southernstorm/noise/protocol/DHState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/DHState.java
rename to src/main/java/com/southernstorm/noise/protocol/DHState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/DHStateHybrid.java b/src/main/java/com/southernstorm/noise/protocol/DHStateHybrid.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/DHStateHybrid.java
rename to src/main/java/com/southernstorm/noise/protocol/DHStateHybrid.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/Destroyable.java b/src/main/java/com/southernstorm/noise/protocol/Destroyable.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/Destroyable.java
rename to src/main/java/com/southernstorm/noise/protocol/Destroyable.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/HandshakeState.java b/src/main/java/com/southernstorm/noise/protocol/HandshakeState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/HandshakeState.java
rename to src/main/java/com/southernstorm/noise/protocol/HandshakeState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/NewHopeDHState.java b/src/main/java/com/southernstorm/noise/protocol/NewHopeDHState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/NewHopeDHState.java
rename to src/main/java/com/southernstorm/noise/protocol/NewHopeDHState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/Noise.java b/src/main/java/com/southernstorm/noise/protocol/Noise.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/Noise.java
rename to src/main/java/com/southernstorm/noise/protocol/Noise.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/Pattern.java b/src/main/java/com/southernstorm/noise/protocol/Pattern.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/Pattern.java
rename to src/main/java/com/southernstorm/noise/protocol/Pattern.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/SymmetricState.java b/src/main/java/com/southernstorm/noise/protocol/SymmetricState.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/SymmetricState.java
rename to src/main/java/com/southernstorm/noise/protocol/SymmetricState.java
diff --git a/NoiseJava/src/com/southernstorm/noise/protocol/package-info.java b/src/main/java/com/southernstorm/noise/protocol/package-info.java
similarity index 100%
rename from NoiseJava/src/com/southernstorm/noise/protocol/package-info.java
rename to src/main/java/com/southernstorm/noise/protocol/package-info.java
diff --git a/NoiseJavaTests/.gitignore b/src/test/java/.gitignore
similarity index 100%
rename from NoiseJavaTests/.gitignore
rename to src/test/java/.gitignore
diff --git a/NoiseJavaTests/src/com/southernstorm/json/JsonReader.java b/src/test/java/com/southernstorm/json/JsonReader.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/json/JsonReader.java
rename to src/test/java/com/southernstorm/json/JsonReader.java
diff --git a/NoiseJavaTests/src/com/southernstorm/json/JsonToken.java b/src/test/java/com/southernstorm/json/JsonToken.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/json/JsonToken.java
rename to src/test/java/com/southernstorm/json/JsonToken.java
diff --git a/NoiseJavaTests/src/com/southernstorm/json/MalformedJsonException.java b/src/test/java/com/southernstorm/json/MalformedJsonException.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/json/MalformedJsonException.java
rename to src/test/java/com/southernstorm/json/MalformedJsonException.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/CipherStateTests.java b/src/test/java/com/southernstorm/noise/tests/CipherStateTests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/CipherStateTests.java
rename to src/test/java/com/southernstorm/noise/tests/CipherStateTests.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/Curve25519Tests.java b/src/test/java/com/southernstorm/noise/tests/Curve25519Tests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/Curve25519Tests.java
rename to src/test/java/com/southernstorm/noise/tests/Curve25519Tests.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/Curve448Tests.java b/src/test/java/com/southernstorm/noise/tests/Curve448Tests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/Curve448Tests.java
rename to src/test/java/com/southernstorm/noise/tests/Curve448Tests.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/GHASHTests.java b/src/test/java/com/southernstorm/noise/tests/GHASHTests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/GHASHTests.java
rename to src/test/java/com/southernstorm/noise/tests/GHASHTests.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/HashTests.java b/src/test/java/com/southernstorm/noise/tests/HashTests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/HashTests.java
rename to src/test/java/com/southernstorm/noise/tests/HashTests.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/Poly1305Tests.java b/src/test/java/com/southernstorm/noise/tests/Poly1305Tests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/Poly1305Tests.java
rename to src/test/java/com/southernstorm/noise/tests/Poly1305Tests.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/RijndaelAESTests.java b/src/test/java/com/southernstorm/noise/tests/RijndaelAESTests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/RijndaelAESTests.java
rename to src/test/java/com/southernstorm/noise/tests/RijndaelAESTests.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/TestUtils.java b/src/test/java/com/southernstorm/noise/tests/TestUtils.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/TestUtils.java
rename to src/test/java/com/southernstorm/noise/tests/TestUtils.java
diff --git a/NoiseJavaTests/src/com/southernstorm/noise/tests/VectorTests.java b/src/test/java/com/southernstorm/noise/tests/VectorTests.java
similarity index 100%
rename from NoiseJavaTests/src/com/southernstorm/noise/tests/VectorTests.java
rename to src/test/java/com/southernstorm/noise/tests/VectorTests.java