diff --git a/src/main/java/org/qora/crypto/CiyamMemoryPoW.java b/src/main/java/org/qora/crypto/MemoryPoW.java
similarity index 98%
rename from src/main/java/org/qora/crypto/CiyamMemoryPoW.java
rename to src/main/java/org/qora/crypto/MemoryPoW.java
index b0cf2458..62b81e22 100644
--- a/src/main/java/org/qora/crypto/CiyamMemoryPoW.java
+++ b/src/main/java/org/qora/crypto/MemoryPoW.java
@@ -2,7 +2,7 @@ package org.qora.crypto;
 
 import com.google.common.primitives.Bytes;
 
-public class CiyamMemoryPoW {
+public class MemoryPoW {
 
 	private static final int WORK_BUFFER_LENGTH = 4 * 1024 * 1024;
 	private static final int WORK_BUFFER_LENGTH_MASK = WORK_BUFFER_LENGTH - 1;
diff --git a/src/test/java/org/qora/test/CiyamMemoryPoWTests.java b/src/test/java/org/qora/test/MemoryPoWTests.java
similarity index 81%
rename from src/test/java/org/qora/test/CiyamMemoryPoWTests.java
rename to src/test/java/org/qora/test/MemoryPoWTests.java
index e2e99cac..0fbd984e 100644
--- a/src/test/java/org/qora/test/CiyamMemoryPoWTests.java
+++ b/src/test/java/org/qora/test/MemoryPoWTests.java
@@ -1,13 +1,13 @@
 package org.qora.test;
 
 import org.junit.Test;
-import org.qora.crypto.CiyamMemoryPoW;
+import org.qora.crypto.MemoryPoW;
 
 import static org.junit.Assert.*;
 
 import java.util.Random;
 
-public class CiyamMemoryPoWTests {
+public class MemoryPoWTests {
 
 	@Test
 	public void testCompute() {
@@ -21,7 +21,7 @@ public class CiyamMemoryPoWTests {
 		int difficulty = 1;
 
 		long startTime = System.currentTimeMillis();
-		Integer nonce = CiyamMemoryPoW.compute(data, start, range, difficulty);
+		Integer nonce = MemoryPoW.compute(data, start, range, difficulty);
 		long finishTime = System.currentTimeMillis();
 
 		System.out.println(String.format("Memory-hard PoW took %dms", finishTime - startTime));
diff --git a/src/test/java/org/qora/test/BTCACCTTests.java b/src/test/java/org/qora/test/apps/BTCACCTTests.java
similarity index 99%
rename from src/test/java/org/qora/test/BTCACCTTests.java
rename to src/test/java/org/qora/test/apps/BTCACCTTests.java
index f83d3c2c..b7c7e157 100644
--- a/src/test/java/org/qora/test/BTCACCTTests.java
+++ b/src/test/java/org/qora/test/apps/BTCACCTTests.java
@@ -1,4 +1,4 @@
-package org.qora.test;
+package org.qora.test.apps;
 
 import java.io.File;
 import java.net.UnknownHostException;
diff --git a/src/main/java/org/qora/DecodeOnlineAccounts.java b/src/test/java/org/qora/test/apps/DecodeOnlineAccounts.java
similarity index 99%
rename from src/main/java/org/qora/DecodeOnlineAccounts.java
rename to src/test/java/org/qora/test/apps/DecodeOnlineAccounts.java
index 4456274c..7ab4e5f5 100644
--- a/src/main/java/org/qora/DecodeOnlineAccounts.java
+++ b/src/test/java/org/qora/test/apps/DecodeOnlineAccounts.java
@@ -1,4 +1,4 @@
-package org.qora;
+package org.qora.test.apps;
 
 import java.security.Security;
 
diff --git a/src/test/java/org/qora/test/NTPTests.java b/src/test/java/org/qora/test/apps/NTPTests.java
similarity index 99%
rename from src/test/java/org/qora/test/NTPTests.java
rename to src/test/java/org/qora/test/apps/NTPTests.java
index e5398f6d..b1fd880c 100644
--- a/src/test/java/org/qora/test/NTPTests.java
+++ b/src/test/java/org/qora/test/apps/NTPTests.java
@@ -1,4 +1,4 @@
-package org.qora.test;
+package org.qora.test.apps;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/src/test/java/org/qora/test/ProxyTest.java b/src/test/java/org/qora/test/apps/ProxyTest.java
similarity index 99%
rename from src/test/java/org/qora/test/ProxyTest.java
rename to src/test/java/org/qora/test/apps/ProxyTest.java
index 25d6a1b3..5f0d519f 100644
--- a/src/test/java/org/qora/test/ProxyTest.java
+++ b/src/test/java/org/qora/test/apps/ProxyTest.java
@@ -1,4 +1,4 @@
-package org.qora.test;
+package org.qora.test.apps;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/qora/RewardShareKeys.java b/src/test/java/org/qora/test/apps/RewardShareKeys.java
similarity index 98%
rename from src/main/java/org/qora/RewardShareKeys.java
rename to src/test/java/org/qora/test/apps/RewardShareKeys.java
index 689323b9..dac7405f 100644
--- a/src/main/java/org/qora/RewardShareKeys.java
+++ b/src/test/java/org/qora/test/apps/RewardShareKeys.java
@@ -1,4 +1,4 @@
-package org.qora;
+package org.qora.test.apps;
 
 import java.security.Security;
 
diff --git a/src/test/java/org/qora/test/SettingsTests.java b/src/test/java/org/qora/test/apps/SettingsTests.java
similarity index 98%
rename from src/test/java/org/qora/test/SettingsTests.java
rename to src/test/java/org/qora/test/apps/SettingsTests.java
index c9903702..10edd227 100644
--- a/src/test/java/org/qora/test/SettingsTests.java
+++ b/src/test/java/org/qora/test/apps/SettingsTests.java
@@ -1,4 +1,4 @@
-package org.qora.test;
+package org.qora.test.apps;
 
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/src/test/java/org/qora/test/SyncReport.java b/src/test/java/org/qora/test/apps/SyncReport.java
similarity index 99%
rename from src/test/java/org/qora/test/SyncReport.java
rename to src/test/java/org/qora/test/apps/SyncReport.java
index 0efe9cd6..6dcf054b 100644
--- a/src/test/java/org/qora/test/SyncReport.java
+++ b/src/test/java/org/qora/test/apps/SyncReport.java
@@ -1,4 +1,4 @@
-package org.qora.test;
+package org.qora.test.apps;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/qora/VanityGen.java b/src/test/java/org/qora/test/apps/VanityGen.java
similarity index 98%
rename from src/main/java/org/qora/VanityGen.java
rename to src/test/java/org/qora/test/apps/VanityGen.java
index 54dfdf41..af8c7384 100644
--- a/src/main/java/org/qora/VanityGen.java
+++ b/src/test/java/org/qora/test/apps/VanityGen.java
@@ -1,4 +1,4 @@
-package org.qora;
+package org.qora.test.apps;
 
 import java.security.SecureRandom;
 import java.security.Security;
diff --git a/src/test/java/org/qora/test/WindowsTimeServiceTests.java b/src/test/java/org/qora/test/apps/WindowsTimeServiceTests.java
similarity index 98%
rename from src/test/java/org/qora/test/WindowsTimeServiceTests.java
rename to src/test/java/org/qora/test/apps/WindowsTimeServiceTests.java
index ba471124..e7b0d45f 100644
--- a/src/test/java/org/qora/test/WindowsTimeServiceTests.java
+++ b/src/test/java/org/qora/test/apps/WindowsTimeServiceTests.java
@@ -1,4 +1,4 @@
-package org.qora.test;
+package org.qora.test.apps;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/qora/XorUpdate.java b/src/test/java/org/qora/test/apps/XorUpdate.java
similarity index 97%
rename from src/main/java/org/qora/XorUpdate.java
rename to src/test/java/org/qora/test/apps/XorUpdate.java
index 553f8b44..ba08911d 100644
--- a/src/main/java/org/qora/XorUpdate.java
+++ b/src/test/java/org/qora/test/apps/XorUpdate.java
@@ -1,4 +1,4 @@
-package org.qora;
+package org.qora.test.apps;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/qora/brokenmd160.java b/src/test/java/org/qora/test/apps/brokenmd160.java
similarity index 94%
rename from src/main/java/org/qora/brokenmd160.java
rename to src/test/java/org/qora/test/apps/brokenmd160.java
index a67198fa..74aa97a3 100644
--- a/src/main/java/org/qora/brokenmd160.java
+++ b/src/test/java/org/qora/test/apps/brokenmd160.java
@@ -1,4 +1,4 @@
-package org.qora;
+package org.qora.test.apps;
 import org.qora.crypto.BrokenMD160;
 
 import com.google.common.hash.HashCode;
diff --git a/src/main/java/org/qora/orphan.java b/src/test/java/org/qora/test/apps/orphan.java
similarity index 98%
rename from src/main/java/org/qora/orphan.java
rename to src/test/java/org/qora/test/apps/orphan.java
index 38fcd649..e6d77107 100644
--- a/src/main/java/org/qora/orphan.java
+++ b/src/test/java/org/qora/test/apps/orphan.java
@@ -1,4 +1,4 @@
-package org.qora;
+package org.qora.test.apps;
 import java.security.Security;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;