diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
index 4db89688..c8da187f 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
@@ -2,6 +2,7 @@ package org.qortal.arbitrary;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qortal.arbitrary.metadata.ArbitraryDataMetadataCache;
 import org.qortal.data.transaction.ArbitraryTransactionData;
 import org.qortal.data.transaction.ArbitraryTransactionData.Method;
 import org.qortal.data.transaction.ArbitraryTransactionData.Service;
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java
index bf49ae99..ccbfb85c 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataCombiner.java
@@ -3,6 +3,7 @@ package org.qortal.arbitrary;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qortal.arbitrary.metadata.ArbitraryDataMetadataPatch;
 import org.qortal.utils.FilesystemUtils;
 
 import java.io.File;
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java
index 84280738..8db1af09 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataDiff.java
@@ -2,6 +2,7 @@ package org.qortal.arbitrary;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qortal.arbitrary.metadata.ArbitraryDataMetadataPatch;
 import org.qortal.crypto.Crypto;
 import org.qortal.settings.Settings;
 
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataMerge.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataMerge.java
index 79fc5eaa..d4faf124 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataMerge.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataMerge.java
@@ -3,6 +3,7 @@ package org.qortal.arbitrary;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.qortal.arbitrary.metadata.ArbitraryDataMetadataPatch;
 import org.qortal.settings.Settings;
 import org.qortal.utils.FilesystemUtils;
 
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataMetadata.java b/src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadata.java
similarity index 94%
rename from src/main/java/org/qortal/arbitrary/ArbitraryDataMetadata.java
rename to src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadata.java
index 5cf04b5d..7dcfd1b5 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataMetadata.java
+++ b/src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadata.java
@@ -1,10 +1,7 @@
-package org.qortal.arbitrary;
+package org.qortal.arbitrary.metadata;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.qortal.utils.Base58;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataMetadataCache.java b/src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadataCache.java
similarity index 96%
rename from src/main/java/org/qortal/arbitrary/ArbitraryDataMetadataCache.java
rename to src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadataCache.java
index cfe56593..d6d7a2b4 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataMetadataCache.java
+++ b/src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadataCache.java
@@ -1,8 +1,7 @@
-package org.qortal.arbitrary;
+package org.qortal.arbitrary.metadata;
 
 import org.json.JSONObject;
 import org.qortal.utils.Base58;
-import org.qortal.utils.NTP;
 
 import java.nio.file.Path;
 
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataMetadataPatch.java b/src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadataPatch.java
similarity index 98%
rename from src/main/java/org/qortal/arbitrary/ArbitraryDataMetadataPatch.java
rename to src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadataPatch.java
index 2c1f4a7c..fd68bec3 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataMetadataPatch.java
+++ b/src/main/java/org/qortal/arbitrary/metadata/ArbitraryDataMetadataPatch.java
@@ -1,4 +1,4 @@
-package org.qortal.arbitrary;
+package org.qortal.arbitrary.metadata;
 
 import org.json.JSONArray;
 import org.json.JSONObject;