diff --git a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt
index 493717c2..4d27cb81 100644
--- a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt
+++ b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt
@@ -11,8 +11,8 @@ import org.pgpainless.wot.KeyRingCertificateStore
 import org.pgpainless.wot.WebOfTrust
 import org.pgpainless.wot.api.WoTAPI
 import org.pgpainless.wot.cli.subcommands.*
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.ReferenceTime
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.ReferenceTime
 import pgp.cert_d.PGPCertificateStoreAdapter
 import pgp.cert_d.subkey_lookup.InMemorySubkeyLookupFactory
 import pgp.certificate_store.PGPCertificateStore
diff --git a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt
index 92e0140d..43cd0ef1 100644
--- a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt
+++ b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt
@@ -6,8 +6,8 @@ package org.pgpainless.wot.cli.subcommands
 
 import org.pgpainless.wot.api.AuthenticateAPI
 import org.pgpainless.wot.cli.WotCLI
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Path
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Path
 import picocli.CommandLine
 import picocli.CommandLine.Command
 import picocli.CommandLine.Parameters
diff --git a/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt b/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt
index d1c1b905..d915c167 100644
--- a/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt
+++ b/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt
@@ -2,7 +2,7 @@ package org.pgpainless.wot.cli.subcommands
 
 import org.junit.jupiter.api.Test
 import org.pgpainless.wot.api.AuthenticateAPI
-import org.pgpainless.wot.dijkstra.sq.*
+import org.pgpainless.wot.network.*
 import java.text.SimpleDateFormat
 import kotlin.test.assertEquals
 
diff --git a/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt b/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt
index e4eb3f6e..3ae2ea6b 100644
--- a/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt
+++ b/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/WebOfTrust.kt
@@ -17,8 +17,8 @@ import org.pgpainless.policy.Policy
 import org.pgpainless.signature.SignatureUtils
 import org.pgpainless.signature.consumer.SignatureVerifier
 import org.pgpainless.signature.subpackets.SignatureSubpacketsUtil
-import org.pgpainless.wot.dijkstra.sq.*
-import org.pgpainless.wot.dijkstra.sq.ReferenceTime.Companion.now
+import org.pgpainless.wot.network.*
+import org.pgpainless.wot.network.ReferenceTime.Companion.now
 import org.pgpainless.wot.util.CertificationFactory.Companion.fromCertification
 import org.pgpainless.wot.util.CertificationFactory.Companion.fromDelegation
 import org.slf4j.LoggerFactory
diff --git a/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/util/CertificationFactory.kt b/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/util/CertificationFactory.kt
index 6ad05b0c..07a39994 100644
--- a/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/util/CertificationFactory.kt
+++ b/pgpainless-wot/src/main/kotlin/org/pgpainless/wot/util/CertificationFactory.kt
@@ -6,11 +6,11 @@ package org.pgpainless.wot.util
 
 import org.bouncycastle.openpgp.PGPSignature
 import org.pgpainless.signature.subpackets.SignatureSubpacketsUtil
-import org.pgpainless.wot.dijkstra.sq.Node
-import org.pgpainless.wot.dijkstra.sq.Edge
-import org.pgpainless.wot.dijkstra.sq.Depth
-import org.pgpainless.wot.dijkstra.sq.RegexSet
-import org.pgpainless.wot.dijkstra.sq.RegexSet.Companion.fromExpressionList
+import org.pgpainless.wot.network.Node
+import org.pgpainless.wot.network.Edge
+import org.pgpainless.wot.network.Depth
+import org.pgpainless.wot.network.RegexSet
+import org.pgpainless.wot.network.RegexSet.Companion.fromExpressionList
 
 class CertificationFactory {
 
diff --git a/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/PGPDSL.kt b/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/PGPDSL.kt
index 73547ef6..6a92224c 100644
--- a/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/PGPDSL.kt
+++ b/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/PGPDSL.kt
@@ -5,9 +5,9 @@ import org.bouncycastle.openpgp.PGPSignature
 import org.pgpainless.algorithm.RevocationStateType
 import org.pgpainless.key.OpenPgpFingerprint
 import org.pgpainless.key.info.KeyRingInfo
-import org.pgpainless.wot.dijkstra.sq.Node
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.RevocationState
+import org.pgpainless.wot.network.Node
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.RevocationState
 
 interface PGPDSL {
 
diff --git a/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustTest.kt b/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustTest.kt
index b7747515..a0697729 100644
--- a/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustTest.kt
+++ b/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustTest.kt
@@ -7,9 +7,9 @@ package org.pgpainless.wot
 import org.bouncycastle.openpgp.PGPPublicKeyRing
 
 import org.pgpainless.key.OpenPgpFingerprint
-import org.pgpainless.wot.dijkstra.sq.EdgeSet
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Network
+import org.pgpainless.wot.network.EdgeSet
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Network
 import org.pgpainless.wot.testfixtures.TestCertificateStores
 import org.pgpainless.wot.testfixtures.WotTestVectors
 import kotlin.test.assertEquals
diff --git a/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustUnitTest.kt b/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustUnitTest.kt
index 20a12ad6..32bef53d 100644
--- a/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustUnitTest.kt
+++ b/pgpainless-wot/src/test/kotlin/org/pgpainless/wot/WebOfTrustUnitTest.kt
@@ -2,13 +2,13 @@ package org.pgpainless.wot
 
 import org.junit.jupiter.api.Test
 import org.pgpainless.PGPainless
-import org.pgpainless.wot.dijkstra.Query
-import org.pgpainless.wot.dijkstra.sq.Roots
-import org.pgpainless.wot.dijkstra.filter.IdempotentCertificationFilter
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Network
-import org.pgpainless.wot.dijkstra.sq.Path
-import org.pgpainless.wot.dijkstra.sq.Root
+import org.pgpainless.wot.query.Query
+import org.pgpainless.wot.query.Roots
+import org.pgpainless.wot.query.filter.IdempotentCertificationFilter
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Network
+import org.pgpainless.wot.network.Path
+import org.pgpainless.wot.query.Root
 import java.io.File
 
 private const val DEPTH_UNCONSTRAINED = 255
diff --git a/pgpainless-wot/src/testFixtures/kotlin/org/pgpainless/wot/testfixtures/AdHocVectors.kt b/pgpainless-wot/src/testFixtures/kotlin/org/pgpainless/wot/testfixtures/AdHocVectors.kt
index 20f1c4f1..dded80c7 100644
--- a/pgpainless-wot/src/testFixtures/kotlin/org/pgpainless/wot/testfixtures/AdHocVectors.kt
+++ b/pgpainless-wot/src/testFixtures/kotlin/org/pgpainless/wot/testfixtures/AdHocVectors.kt
@@ -11,7 +11,7 @@ import org.pgpainless.key.protection.SecretKeyRingProtector
 import org.pgpainless.signature.subpackets.CertificationSubpackets
 import org.pgpainless.signature.subpackets.CertificationSubpackets.Callback
 import org.pgpainless.wot.KeyRingCertificateStore
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
+import org.pgpainless.wot.network.Fingerprint
 import pgp.certificate_store.PGPCertificateStore
 
 interface AdHocVectors {
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticateAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticateAPI.kt
index cd19a7e4..c929519c 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticateAPI.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticateAPI.kt
@@ -4,8 +4,8 @@
 
 package org.pgpainless.wot.api
 
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Paths
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Paths
 
 /**
  * Authenticate a binding.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/IdentifyAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/IdentifyAPI.kt
index 647fdafb..d70b97ed 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/IdentifyAPI.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/IdentifyAPI.kt
@@ -4,8 +4,8 @@
 
 package org.pgpainless.wot.api
 
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Paths
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Paths
 
 interface IdentifyAPI {
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/ListAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/ListAPI.kt
index cf64e056..df40d83c 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/ListAPI.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/ListAPI.kt
@@ -4,7 +4,7 @@
 
 package org.pgpainless.wot.api
 
-import org.pgpainless.wot.dijkstra.sq.Paths
+import org.pgpainless.wot.network.Paths
 
 interface ListAPI {
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/LookupAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/LookupAPI.kt
index 09ff9f75..37903e10 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/LookupAPI.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/LookupAPI.kt
@@ -4,7 +4,7 @@
 
 package org.pgpainless.wot.api
 
-import org.pgpainless.wot.dijkstra.sq.Paths
+import org.pgpainless.wot.network.Paths
 
 interface LookupAPI {
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/PathAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/PathAPI.kt
index 01faa9f9..b3b5af16 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/PathAPI.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/PathAPI.kt
@@ -4,7 +4,7 @@
 
 package org.pgpainless.wot.api
 
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
+import org.pgpainless.wot.network.Fingerprint
 
 interface PathAPI {
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt
index c5691702..3d32f047 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt
@@ -4,9 +4,9 @@
 
 package org.pgpainless.wot.api
 
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Network
-import org.pgpainless.wot.dijkstra.sq.ReferenceTime
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Network
+import org.pgpainless.wot.network.ReferenceTime
 
 /**
  * Web of Trust API, offering different operations.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/package-info.java b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/package-info.java
deleted file mode 100644
index 67584851..00000000
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-FileCopyrightText: 2023 Heiko Schaefer <heiko@schaefer@name>
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package org.pgpainless.wot.dijkstra;
\ No newline at end of file
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Depth.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Depth.kt
similarity index 98%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Depth.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Depth.kt
index 9c0bbe0d..6864c760 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Depth.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Depth.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 /**
  * Depth of a trust signature.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Edge.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Edge.kt
similarity index 98%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Edge.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Edge.kt
index 7e1a1f53..d55578fa 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Edge.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Edge.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 import java.util.*
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/EdgeSet.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/EdgeSet.kt
similarity index 99%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/EdgeSet.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/EdgeSet.kt
index 2223a14f..682feda8 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/EdgeSet.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/EdgeSet.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 /**
  * A [EdgeSet] is a set of [Certifications][Edge] made by the same issuer, on the same
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Fingerprint.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Fingerprint.kt
similarity index 94%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Fingerprint.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Fingerprint.kt
index f05b4ff6..4e3ae215 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Fingerprint.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Fingerprint.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 class Fingerprint(fingerprint: String) : Comparable<Fingerprint> {
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Network.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Network.kt
similarity index 98%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Network.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Network.kt
index b050d530..fbca5dfc 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Network.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Network.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 /**
  * A network consists of nodes, and edgeSet between them.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Node.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Node.kt
similarity index 96%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Node.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Node.kt
index 662ba134..f372231e 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Node.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Node.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 import java.util.*
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Path.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Path.kt
similarity index 99%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Path.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Path.kt
index 9d71fea0..3c6c6a36 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Path.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Path.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 import kotlin.math.min
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Paths.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Paths.kt
similarity index 96%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Paths.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Paths.kt
index 175bbdad..7d44f915 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Paths.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/Paths.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 /**
  * List of individual [Paths][Path].
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/ReferenceTime.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/ReferenceTime.kt
similarity index 95%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/ReferenceTime.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/ReferenceTime.kt
index 178420dc..878fc1c5 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/ReferenceTime.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/ReferenceTime.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 import java.util.*
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/RegexSet.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/RegexSet.kt
similarity index 97%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/RegexSet.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/RegexSet.kt
index d9230db7..9b2f8de8 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/RegexSet.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/RegexSet.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 import java.util.regex.Pattern
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/RevocationState.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/RevocationState.kt
similarity index 97%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/RevocationState.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/RevocationState.kt
index b04c3dba..6f2466b0 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/RevocationState.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/network/RevocationState.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.network
 
 import java.util.*
 import kotlin.math.abs
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/PairPriorityQueue.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/PairPriorityQueue.kt
similarity index 97%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/PairPriorityQueue.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/PairPriorityQueue.kt
index 3c37ab1b..0b460aa2 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/PairPriorityQueue.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/PairPriorityQueue.kt
@@ -1,4 +1,4 @@
-package org.pgpainless.wot.dijkstra
+package org.pgpainless.wot.query
 
 import java.util.PriorityQueue
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/Query.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Query.kt
similarity index 99%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/Query.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Query.kt
index a2657131..190a9824 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/Query.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Query.kt
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra
+package org.pgpainless.wot.query
 
-import org.pgpainless.wot.dijkstra.filter.*
-import org.pgpainless.wot.dijkstra.sq.*
+import org.pgpainless.wot.network.*
+import org.pgpainless.wot.query.filter.*
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.util.Date
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Root.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Root.kt
similarity index 74%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Root.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Root.kt
index 0a458322..f18cd204 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Root.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Root.kt
@@ -2,7 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.query
+
+import org.pgpainless.wot.network.Fingerprint
 
 data class Root(val fingerprint: Fingerprint, val amount: Int) {
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Roots.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Roots.kt
similarity index 92%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Roots.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Roots.kt
index 41c25b52..dcae7008 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/Roots.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/Roots.kt
@@ -2,7 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.sq
+package org.pgpainless.wot.query
+
+import org.pgpainless.wot.network.Fingerprint
 
 /**
  * A set of `Root`s (that can be used as the basis for authentication lookups).
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/CapCertificateFilter.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/CapCertificateFilter.kt
similarity index 87%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/CapCertificateFilter.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/CapCertificateFilter.kt
index b4406da3..2c85adec 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/CapCertificateFilter.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/CapCertificateFilter.kt
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.filter
+package org.pgpainless.wot.query.filter
 
-import org.pgpainless.wot.dijkstra.sq.Edge
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
+import org.pgpainless.wot.network.Edge
+import org.pgpainless.wot.network.Fingerprint
 
 class CapCertificateFilter() : CertificationFilter {
 
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/CertificationFilter.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/CertificationFilter.kt
similarity index 85%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/CertificationFilter.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/CertificationFilter.kt
index dffcd1ee..2083bcf3 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/CertificationFilter.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/CertificationFilter.kt
@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.filter
+package org.pgpainless.wot.query.filter
 
-import org.pgpainless.wot.dijkstra.sq.Edge
-import org.pgpainless.wot.dijkstra.sq.Depth
-import org.pgpainless.wot.dijkstra.sq.RegexSet
+import org.pgpainless.wot.network.Edge
+import org.pgpainless.wot.network.Depth
+import org.pgpainless.wot.network.RegexSet
 
 /**
  * Current effective values for `depth`, `amount` and `regexps`.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/ChainFilter.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/ChainFilter.kt
similarity index 88%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/ChainFilter.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/ChainFilter.kt
index 9e9eed9f..aa724111 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/ChainFilter.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/ChainFilter.kt
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.filter
+package org.pgpainless.wot.query.filter
 
-import org.pgpainless.wot.dijkstra.sq.Edge
+import org.pgpainless.wot.network.Edge
 
 /**
  * A filter that chains multiple filters together.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/IdempotentCertificationFilter.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/IdempotentCertificationFilter.kt
similarity index 85%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/IdempotentCertificationFilter.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/IdempotentCertificationFilter.kt
index e3cb26c3..3e9ca284 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/IdempotentCertificationFilter.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/IdempotentCertificationFilter.kt
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.filter
+package org.pgpainless.wot.query.filter
 
 /**
  * A no-op filter.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/SuppressCertificationFilter.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/SuppressCertificationFilter.kt
similarity index 89%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/SuppressCertificationFilter.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/SuppressCertificationFilter.kt
index 08a48d9e..d4d58407 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/SuppressCertificationFilter.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/SuppressCertificationFilter.kt
@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.filter
+package org.pgpainless.wot.query.filter
 
-import org.pgpainless.wot.dijkstra.sq.Edge
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Path
+import org.pgpainless.wot.network.Edge
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Path
 
 class SuppressCertificationFilter() : CertificationFilter {
     // A certification's trust amount will be suppressed by this amount.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/SuppressIssuerFilter.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/SuppressIssuerFilter.kt
similarity index 90%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/SuppressIssuerFilter.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/SuppressIssuerFilter.kt
index 13c01fb1..518b8faa 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/SuppressIssuerFilter.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/SuppressIssuerFilter.kt
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.filter
+package org.pgpainless.wot.query.filter
 
-import org.pgpainless.wot.dijkstra.sq.Edge
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
+import org.pgpainless.wot.network.Edge
+import org.pgpainless.wot.network.Fingerprint
 
 /**
  * A filter that suppresses some capacity of an issuer.
diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/TrustedIntroducerFilter.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/TrustedIntroducerFilter.kt
similarity index 83%
rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/TrustedIntroducerFilter.kt
rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/TrustedIntroducerFilter.kt
index b3be1d11..c62217ff 100644
--- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/filter/TrustedIntroducerFilter.kt
+++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/query/filter/TrustedIntroducerFilter.kt
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.pgpainless.wot.dijkstra.filter
+package org.pgpainless.wot.query.filter
 
-import org.pgpainless.wot.dijkstra.sq.Edge
-import org.pgpainless.wot.dijkstra.sq.Depth
+import org.pgpainless.wot.network.Edge
+import org.pgpainless.wot.network.Depth
 
 /**
  * A filter that treats every certification as a trust signature with unconstrained depth,
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/CostTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/CostTest.kt
index 281e78f1..d021198e 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/CostTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/CostTest.kt
@@ -4,6 +4,7 @@
 
 package org.pgpainless.wot.dijkstra
 
+import org.pgpainless.wot.query.Cost
 import kotlin.test.Test
 
 class CostTest {
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/DepthTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/DepthTest.kt
index 8eb4d14d..cd5b223a 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/DepthTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/DepthTest.kt
@@ -6,10 +6,9 @@ package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.pgpainless.wot.dijkstra.sq.Depth
-import org.pgpainless.wot.dijkstra.sq.Depth.Companion.auto
-import org.pgpainless.wot.dijkstra.sq.Depth.Companion.limited
-import org.pgpainless.wot.dijkstra.sq.Depth.Companion.unconstrained
+import org.pgpainless.wot.network.Depth.Companion.auto
+import org.pgpainless.wot.network.Depth.Companion.limited
+import org.pgpainless.wot.network.Depth.Companion.unconstrained
 import kotlin.test.*
 
 class DepthTest {
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeSetTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeSetTest.kt
index f81113c1..10f7f360 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeSetTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeSetTest.kt
@@ -6,7 +6,7 @@ package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.pgpainless.wot.dijkstra.sq.*
+import org.pgpainless.wot.network.*
 import java.util.*
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeTest.kt
index 2e966404..5614e437 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/EdgeTest.kt
@@ -1,10 +1,10 @@
 package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
-import org.pgpainless.wot.dijkstra.sq.Node
-import org.pgpainless.wot.dijkstra.sq.Edge
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.RevocationState
+import org.pgpainless.wot.network.Node
+import org.pgpainless.wot.network.Edge
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.RevocationState
 import java.util.*
 import kotlin.test.assertEquals
 
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/FingerprintTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/FingerprintTest.kt
index f710c337..36dbd275 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/FingerprintTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/FingerprintTest.kt
@@ -1,7 +1,7 @@
 package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
+import org.pgpainless.wot.network.Fingerprint
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkDSL.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkDSL.kt
index d6096ad8..9b2e8773 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkDSL.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkDSL.kt
@@ -4,7 +4,7 @@
 
 package org.pgpainless.wot.dijkstra
 
-import org.pgpainless.wot.dijkstra.sq.*
+import org.pgpainless.wot.network.*
 import java.util.*
 
 /**
@@ -126,7 +126,7 @@ interface NetworkDSL {
      * Set the reference time of the builder to now.
      */
     fun Network.Builder.now(): Network.Builder {
-        return setReferenceTime(ReferenceTime.now())
+        return setReferenceTime(org.pgpainless.wot.network.ReferenceTime.now())
     }
 
     fun Network.getEdgesFor(issuer: Fingerprint, target: Fingerprint): EdgeSet? {
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkTest.kt
index 2941d737..4a432d63 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/NetworkTest.kt
@@ -5,10 +5,10 @@
 package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
-import org.pgpainless.wot.dijkstra.sq.Fingerprint
-import org.pgpainless.wot.dijkstra.sq.Network.Companion.empty
-import org.pgpainless.wot.dijkstra.sq.ReferenceTime.Companion.now
-import org.pgpainless.wot.dijkstra.sq.RegexSet
+import org.pgpainless.wot.network.Fingerprint
+import org.pgpainless.wot.network.Network.Companion.empty
+import org.pgpainless.wot.network.ReferenceTime.Companion.now
+import org.pgpainless.wot.network.RegexSet
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathTest.kt
index e32f5574..a6cf0360 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathTest.kt
@@ -2,8 +2,8 @@ package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.pgpainless.wot.dijkstra.sq.*
-import java.util.*
+import org.pgpainless.wot.network.Depth
+import org.pgpainless.wot.network.Path
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathsTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathsTest.kt
index 067aa066..d22633d3 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathsTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PathsTest.kt
@@ -2,8 +2,9 @@ package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
-import org.pgpainless.wot.dijkstra.sq.*
-import java.util.*
+import org.pgpainless.wot.network.Depth
+import org.pgpainless.wot.network.Path
+import org.pgpainless.wot.network.Paths
 import kotlin.test.assertEquals
 
 class PathsTest: NetworkDSL {
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PriorityQueueTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PriorityQueueTest.kt
index 5069aabd..afac8b89 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PriorityQueueTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/PriorityQueueTest.kt
@@ -1,5 +1,6 @@
 package org.pgpainless.wot.dijkstra
 
+import org.pgpainless.wot.query.PairPriorityQueue
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RegexSetTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RegexSetTest.kt
index 0b133224..4bc6cdd7 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RegexSetTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RegexSetTest.kt
@@ -1,7 +1,7 @@
 package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
-import org.pgpainless.wot.dijkstra.sq.RegexSet
+import org.pgpainless.wot.network.RegexSet
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RevocationStateTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RevocationStateTest.kt
index 4182c37a..eaf52cba 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RevocationStateTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/RevocationStateTest.kt
@@ -1,8 +1,8 @@
 package org.pgpainless.wot.dijkstra
 
 import org.junit.jupiter.api.Test
-import org.pgpainless.wot.dijkstra.sq.ReferenceTime
-import org.pgpainless.wot.dijkstra.sq.RevocationState
+import org.pgpainless.wot.network.ReferenceTime
+import org.pgpainless.wot.network.RevocationState
 import java.util.*
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
diff --git a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/sq/RegexSetTest.kt b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/sq/RegexSetTest.kt
index daa7a17f..b27050b7 100644
--- a/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/sq/RegexSetTest.kt
+++ b/wot-dijkstra/src/test/kotlin/org/pgpainless/wot/dijkstra/sq/RegexSetTest.kt
@@ -1,5 +1,6 @@
 package org.pgpainless.wot.dijkstra.sq
 
+import org.pgpainless.wot.network.RegexSet
 import kotlin.test.Test
 
 class RegexSetTest {