diff --git a/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrust.java b/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrust.java
index 33ecf211..0c9e66f5 100644
--- a/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrust.java
+++ b/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrust.java
@@ -35,6 +35,7 @@ import org.pgpainless.wot.dijkstra.sq.CertificationSet;
 import org.pgpainless.wot.dijkstra.sq.Network;
 import org.pgpainless.wot.dijkstra.sq.Optional;
 import org.pgpainless.wot.dijkstra.sq.ReferenceTime;
+import org.pgpainless.wot.sugar.IterableIterator;
 import org.pgpainless.wot.sugar.Supplier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrustCertificateStore.java b/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrustCertificateStore.java
index e8b04cb0..0629d2ab 100644
--- a/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrustCertificateStore.java
+++ b/pgpainless-wot/src/main/java/org/pgpainless/wot/WebOfTrustCertificateStore.java
@@ -4,6 +4,7 @@
 
 package org.pgpainless.wot;
 
+import org.pgpainless.wot.sugar.PrefixedIterator;
 import pgp.cert_d.PGPCertificateDirectory;
 import pgp.cert_d.ReadOnlyPGPCertificateDirectory;
 import pgp.cert_d.WritingPGPCertificateDirectory;
diff --git a/pgpainless-wot/src/main/java/org/pgpainless/wot/IterableIterator.java b/pgpainless-wot/src/main/java/org/pgpainless/wot/sugar/IterableIterator.java
similarity index 93%
rename from pgpainless-wot/src/main/java/org/pgpainless/wot/IterableIterator.java
rename to pgpainless-wot/src/main/java/org/pgpainless/wot/sugar/IterableIterator.java
index 978696b9..a2de4256 100644
--- a/pgpainless-wot/src/main/java/org/pgpainless/wot/IterableIterator.java
+++ b/pgpainless-wot/src/main/java/org/pgpainless/wot/sugar/IterableIterator.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot;
+package org.pgpainless.wot.sugar;
 
 import java.util.Iterator;
 
diff --git a/pgpainless-wot/src/main/java/org/pgpainless/wot/PrefixedIterator.java b/pgpainless-wot/src/main/java/org/pgpainless/wot/sugar/PrefixedIterator.java
similarity index 95%
rename from pgpainless-wot/src/main/java/org/pgpainless/wot/PrefixedIterator.java
rename to pgpainless-wot/src/main/java/org/pgpainless/wot/sugar/PrefixedIterator.java
index a0456a82..1c31085f 100644
--- a/pgpainless-wot/src/main/java/org/pgpainless/wot/PrefixedIterator.java
+++ b/pgpainless-wot/src/main/java/org/pgpainless/wot/sugar/PrefixedIterator.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot;
+package org.pgpainless.wot.sugar;
 
 import java.util.Iterator;