diff --git a/.gitignore b/.gitignore
index 3e1421ac..a9de67b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,4 +112,4 @@ Temporary Items
 .apdisk
 
 # Auto generated version file
-/minidns-client/src/main/resources/de.measite.minidns/version
+/minidns-core/src/main/resources/de.measite.minidns/version
diff --git a/minidns-client/build.gradle b/minidns-client/build.gradle
index f808afae..16db93e7 100644
--- a/minidns-client/build.gradle
+++ b/minidns-client/build.gradle
@@ -1,23 +1,5 @@
 dependencies {
-    testCompile "junit:junit:$junitVersion"
+	compile project(':minidns-core')
+    testCompile project(path: ":minidns-core", configuration: "testRuntime")
+    testCompile project(path: ":minidns-core", configuration: "archives")
 }
-
-class CreateFileTask extends DefaultTask {
-	@Input
-	String fileContent
-
-	@OutputFile
-	File outputFile
-
-	@TaskAction
-	def createFile() {
-		outputFile.text = fileContent
-	}
-}
-
-task createVersionResource(type: CreateFileTask) {
-	fileContent = version + ' (' + gitCommit + ' ' + builtDate + ')'
-	outputFile = new File(projectDir, 'src/main/resources/de.measite.minidns/version')
-}
-
-compileJava.dependsOn(createVersionResource)
diff --git a/minidns-core/build.gradle b/minidns-core/build.gradle
new file mode 100644
index 00000000..f808afae
--- /dev/null
+++ b/minidns-core/build.gradle
@@ -0,0 +1,23 @@
+dependencies {
+    testCompile "junit:junit:$junitVersion"
+}
+
+class CreateFileTask extends DefaultTask {
+	@Input
+	String fileContent
+
+	@OutputFile
+	File outputFile
+
+	@TaskAction
+	def createFile() {
+		outputFile.text = fileContent
+	}
+}
+
+task createVersionResource(type: CreateFileTask) {
+	fileContent = version + ' (' + gitCommit + ' ' + builtDate + ')'
+	outputFile = new File(projectDir, 'src/main/resources/de.measite.minidns/version')
+}
+
+compileJava.dependsOn(createVersionResource)
diff --git a/minidns-client/src/main/java/de/measite/minidns/DNSMessage.java b/minidns-core/src/main/java/de/measite/minidns/DNSMessage.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/DNSMessage.java
rename to minidns-core/src/main/java/de/measite/minidns/DNSMessage.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/DNSName.java b/minidns-core/src/main/java/de/measite/minidns/DNSName.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/DNSName.java
rename to minidns-core/src/main/java/de/measite/minidns/DNSName.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/DNSSECConstants.java b/minidns-core/src/main/java/de/measite/minidns/DNSSECConstants.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/DNSSECConstants.java
rename to minidns-core/src/main/java/de/measite/minidns/DNSSECConstants.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/EDNS.java b/minidns-core/src/main/java/de/measite/minidns/EDNS.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/EDNS.java
rename to minidns-core/src/main/java/de/measite/minidns/EDNS.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/InvalidDNSNameException.java b/minidns-core/src/main/java/de/measite/minidns/InvalidDNSNameException.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/InvalidDNSNameException.java
rename to minidns-core/src/main/java/de/measite/minidns/InvalidDNSNameException.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/Question.java b/minidns-core/src/main/java/de/measite/minidns/Question.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/Question.java
rename to minidns-core/src/main/java/de/measite/minidns/Question.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/RRSet.java b/minidns-core/src/main/java/de/measite/minidns/RRSet.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/RRSet.java
rename to minidns-core/src/main/java/de/measite/minidns/RRSet.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/Record.java b/minidns-core/src/main/java/de/measite/minidns/Record.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/Record.java
rename to minidns-core/src/main/java/de/measite/minidns/Record.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/ALabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/ALabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/ALabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/ALabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/DNSLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/DNSLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/DNSLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/DNSLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/FakeALabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/FakeALabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/FakeALabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/FakeALabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/LdhLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/LdhLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/LdhLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/LdhLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/LeadingOrTrailingHyphenLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/LeadingOrTrailingHyphenLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/LeadingOrTrailingHyphenLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/LeadingOrTrailingHyphenLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/NonLdhLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/NonLdhLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/NonLdhLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/NonLdhLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/NonReservedLdhLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/NonReservedLdhLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/NonReservedLdhLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/NonReservedLdhLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/OtherNonLdhLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/OtherNonLdhLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/OtherNonLdhLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/OtherNonLdhLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/ReservedLdhLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/ReservedLdhLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/ReservedLdhLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/ReservedLdhLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/UnderscoreLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/UnderscoreLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/UnderscoreLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/UnderscoreLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/dnslabel/XnLabel.java b/minidns-core/src/main/java/de/measite/minidns/dnslabel/XnLabel.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/dnslabel/XnLabel.java
rename to minidns-core/src/main/java/de/measite/minidns/dnslabel/XnLabel.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/edns/EDNSOption.java b/minidns-core/src/main/java/de/measite/minidns/edns/EDNSOption.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/edns/EDNSOption.java
rename to minidns-core/src/main/java/de/measite/minidns/edns/EDNSOption.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/edns/NSID.java b/minidns-core/src/main/java/de/measite/minidns/edns/NSID.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/edns/NSID.java
rename to minidns-core/src/main/java/de/measite/minidns/edns/NSID.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/edns/UnknownEDNSOption.java b/minidns-core/src/main/java/de/measite/minidns/edns/UnknownEDNSOption.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/edns/UnknownEDNSOption.java
rename to minidns-core/src/main/java/de/measite/minidns/edns/UnknownEDNSOption.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/idna/DefaultIdnaTransformator.java b/minidns-core/src/main/java/de/measite/minidns/idna/DefaultIdnaTransformator.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/idna/DefaultIdnaTransformator.java
rename to minidns-core/src/main/java/de/measite/minidns/idna/DefaultIdnaTransformator.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/idna/IdnaTransformator.java b/minidns-core/src/main/java/de/measite/minidns/idna/IdnaTransformator.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/idna/IdnaTransformator.java
rename to minidns-core/src/main/java/de/measite/minidns/idna/IdnaTransformator.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/idna/MiniDnsIdna.java b/minidns-core/src/main/java/de/measite/minidns/idna/MiniDnsIdna.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/idna/MiniDnsIdna.java
rename to minidns-core/src/main/java/de/measite/minidns/idna/MiniDnsIdna.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/A.java b/minidns-core/src/main/java/de/measite/minidns/record/A.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/A.java
rename to minidns-core/src/main/java/de/measite/minidns/record/A.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/AAAA.java b/minidns-core/src/main/java/de/measite/minidns/record/AAAA.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/AAAA.java
rename to minidns-core/src/main/java/de/measite/minidns/record/AAAA.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/CNAME.java b/minidns-core/src/main/java/de/measite/minidns/record/CNAME.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/CNAME.java
rename to minidns-core/src/main/java/de/measite/minidns/record/CNAME.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/DLV.java b/minidns-core/src/main/java/de/measite/minidns/record/DLV.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/DLV.java
rename to minidns-core/src/main/java/de/measite/minidns/record/DLV.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/DNAME.java b/minidns-core/src/main/java/de/measite/minidns/record/DNAME.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/DNAME.java
rename to minidns-core/src/main/java/de/measite/minidns/record/DNAME.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/DNSKEY.java b/minidns-core/src/main/java/de/measite/minidns/record/DNSKEY.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/DNSKEY.java
rename to minidns-core/src/main/java/de/measite/minidns/record/DNSKEY.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/DS.java b/minidns-core/src/main/java/de/measite/minidns/record/DS.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/DS.java
rename to minidns-core/src/main/java/de/measite/minidns/record/DS.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/Data.java b/minidns-core/src/main/java/de/measite/minidns/record/Data.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/Data.java
rename to minidns-core/src/main/java/de/measite/minidns/record/Data.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/DelegatingDnssecRR.java b/minidns-core/src/main/java/de/measite/minidns/record/DelegatingDnssecRR.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/DelegatingDnssecRR.java
rename to minidns-core/src/main/java/de/measite/minidns/record/DelegatingDnssecRR.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/InternetAddressRR.java b/minidns-core/src/main/java/de/measite/minidns/record/InternetAddressRR.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/InternetAddressRR.java
rename to minidns-core/src/main/java/de/measite/minidns/record/InternetAddressRR.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/MX.java b/minidns-core/src/main/java/de/measite/minidns/record/MX.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/MX.java
rename to minidns-core/src/main/java/de/measite/minidns/record/MX.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/NS.java b/minidns-core/src/main/java/de/measite/minidns/record/NS.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/NS.java
rename to minidns-core/src/main/java/de/measite/minidns/record/NS.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/NSEC.java b/minidns-core/src/main/java/de/measite/minidns/record/NSEC.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/NSEC.java
rename to minidns-core/src/main/java/de/measite/minidns/record/NSEC.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/NSEC3.java b/minidns-core/src/main/java/de/measite/minidns/record/NSEC3.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/NSEC3.java
rename to minidns-core/src/main/java/de/measite/minidns/record/NSEC3.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/NSEC3PARAM.java b/minidns-core/src/main/java/de/measite/minidns/record/NSEC3PARAM.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/NSEC3PARAM.java
rename to minidns-core/src/main/java/de/measite/minidns/record/NSEC3PARAM.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/OPENPGPKEY.java b/minidns-core/src/main/java/de/measite/minidns/record/OPENPGPKEY.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/OPENPGPKEY.java
rename to minidns-core/src/main/java/de/measite/minidns/record/OPENPGPKEY.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/OPT.java b/minidns-core/src/main/java/de/measite/minidns/record/OPT.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/OPT.java
rename to minidns-core/src/main/java/de/measite/minidns/record/OPT.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/PTR.java b/minidns-core/src/main/java/de/measite/minidns/record/PTR.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/PTR.java
rename to minidns-core/src/main/java/de/measite/minidns/record/PTR.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/RRSIG.java b/minidns-core/src/main/java/de/measite/minidns/record/RRSIG.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/RRSIG.java
rename to minidns-core/src/main/java/de/measite/minidns/record/RRSIG.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/RRWithTarget.java b/minidns-core/src/main/java/de/measite/minidns/record/RRWithTarget.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/RRWithTarget.java
rename to minidns-core/src/main/java/de/measite/minidns/record/RRWithTarget.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/SOA.java b/minidns-core/src/main/java/de/measite/minidns/record/SOA.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/SOA.java
rename to minidns-core/src/main/java/de/measite/minidns/record/SOA.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/SRV.java b/minidns-core/src/main/java/de/measite/minidns/record/SRV.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/SRV.java
rename to minidns-core/src/main/java/de/measite/minidns/record/SRV.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/TLSA.java b/minidns-core/src/main/java/de/measite/minidns/record/TLSA.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/TLSA.java
rename to minidns-core/src/main/java/de/measite/minidns/record/TLSA.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/TXT.java b/minidns-core/src/main/java/de/measite/minidns/record/TXT.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/TXT.java
rename to minidns-core/src/main/java/de/measite/minidns/record/TXT.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/record/UNKNOWN.java b/minidns-core/src/main/java/de/measite/minidns/record/UNKNOWN.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/record/UNKNOWN.java
rename to minidns-core/src/main/java/de/measite/minidns/record/UNKNOWN.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/Base32.java b/minidns-core/src/main/java/de/measite/minidns/util/Base32.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/Base32.java
rename to minidns-core/src/main/java/de/measite/minidns/util/Base32.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/Base64.java b/minidns-core/src/main/java/de/measite/minidns/util/Base64.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/Base64.java
rename to minidns-core/src/main/java/de/measite/minidns/util/Base64.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/CallbackRecipient.java b/minidns-core/src/main/java/de/measite/minidns/util/CallbackRecipient.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/CallbackRecipient.java
rename to minidns-core/src/main/java/de/measite/minidns/util/CallbackRecipient.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/CollectionsUtil.java b/minidns-core/src/main/java/de/measite/minidns/util/CollectionsUtil.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/CollectionsUtil.java
rename to minidns-core/src/main/java/de/measite/minidns/util/CollectionsUtil.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/ExceptionCallback.java b/minidns-core/src/main/java/de/measite/minidns/util/ExceptionCallback.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/ExceptionCallback.java
rename to minidns-core/src/main/java/de/measite/minidns/util/ExceptionCallback.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/Hex.java b/minidns-core/src/main/java/de/measite/minidns/util/Hex.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/Hex.java
rename to minidns-core/src/main/java/de/measite/minidns/util/Hex.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/InetAddressUtil.java b/minidns-core/src/main/java/de/measite/minidns/util/InetAddressUtil.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/InetAddressUtil.java
rename to minidns-core/src/main/java/de/measite/minidns/util/InetAddressUtil.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/MultipleIoException.java b/minidns-core/src/main/java/de/measite/minidns/util/MultipleIoException.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/MultipleIoException.java
rename to minidns-core/src/main/java/de/measite/minidns/util/MultipleIoException.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/NameUtil.java b/minidns-core/src/main/java/de/measite/minidns/util/NameUtil.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/NameUtil.java
rename to minidns-core/src/main/java/de/measite/minidns/util/NameUtil.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/PlatformDetection.java b/minidns-core/src/main/java/de/measite/minidns/util/PlatformDetection.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/PlatformDetection.java
rename to minidns-core/src/main/java/de/measite/minidns/util/PlatformDetection.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/SrvUtil.java b/minidns-core/src/main/java/de/measite/minidns/util/SrvUtil.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/SrvUtil.java
rename to minidns-core/src/main/java/de/measite/minidns/util/SrvUtil.java
diff --git a/minidns-client/src/main/java/de/measite/minidns/util/SuccessCallback.java b/minidns-core/src/main/java/de/measite/minidns/util/SuccessCallback.java
similarity index 100%
rename from minidns-client/src/main/java/de/measite/minidns/util/SuccessCallback.java
rename to minidns-core/src/main/java/de/measite/minidns/util/SuccessCallback.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/Assert.java b/minidns-core/src/test/java/de/measite/minidns/Assert.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/Assert.java
rename to minidns-core/src/test/java/de/measite/minidns/Assert.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/DNSMessageTest.java b/minidns-core/src/test/java/de/measite/minidns/DNSMessageTest.java
similarity index 93%
rename from minidns-client/src/test/java/de/measite/minidns/DNSMessageTest.java
rename to minidns-core/src/test/java/de/measite/minidns/DNSMessageTest.java
index a030e756..3bc842bb 100644
--- a/minidns-client/src/test/java/de/measite/minidns/DNSMessageTest.java
+++ b/minidns-core/src/test/java/de/measite/minidns/DNSMessageTest.java
@@ -12,6 +12,7 @@
 
 import de.measite.minidns.DNSSECConstants.DigestAlgorithm;
 import de.measite.minidns.DNSSECConstants.SignatureAlgorithm;
+import de.measite.minidns.Record.CLASS;
 import de.measite.minidns.Record.TYPE;
 import de.measite.minidns.record.A;
 import de.measite.minidns.record.AAAA;
@@ -35,6 +36,8 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,10 +48,6 @@
 import java.util.TreeMap;
 
 import static de.measite.minidns.Assert.assertCsEquals;
-import static de.measite.minidns.DNSWorld.a;
-import static de.measite.minidns.DNSWorld.aaaa;
-import static de.measite.minidns.DNSWorld.ns;
-import static de.measite.minidns.DNSWorld.record;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -536,4 +535,60 @@ public void testFilledMessageTerminalOutput() throws Exception {
         message.getEdnsBuilder().setUdpPayloadSize(512);
         assertNotNull(message.build().asTerminalOutput());
     }
+
+    public static Record<Data> record(String name, long ttl, Data data) {
+        return new Record<>(name, data.getType(), CLASS.IN, ttl, data, false);
+    }
+
+    public static Record<Data> record(DNSName name, long ttl, Data data) {
+        return new Record<>(name, data.getType(), CLASS.IN, ttl, data, false);
+    }
+
+    public static Record<Data> record(String name, Data data) {
+        return record(name, 3600, data);
+    }
+
+    public static A a(String ipString) {
+        return a(parseIpV4(ipString));
+    }
+
+    public static A a(byte[] ip) {
+        return new A(ip);
+    }
+
+    public static byte[] parseIpV4(String ipString) {
+        String[] split = ipString.split("\\.");
+        if (split.length != 4) {
+            throw new IllegalArgumentException(ipString + " is not an valid IPv4 address");
+        }
+        byte[] ip = new byte[4];
+        for (int i = 0; i < 4; i++) {
+            ip[i] = (byte) Integer.parseInt(split[i]);
+        }
+        return ip;
+    }
+
+    public static NS ns(String name) {
+        return ns(DNSName.from(name));
+    }
+
+    public static NS ns(DNSName name) {
+        return new NS(name);
+    }
+
+    public static AAAA aaaa(byte[] ip) {
+        return new AAAA(ip);
+    }
+
+    public static AAAA aaaa(String ipString) {
+        return aaaa(parseIpV6(ipString));
+    }
+
+    static byte[] parseIpV6(String ipString) {
+        try {
+            return InetAddress.getByName(ipString).getAddress();
+        } catch (UnknownHostException e) {
+            throw new IllegalArgumentException(ipString + " is not an valid IPv6 address", e);
+        }
+    }
 }
diff --git a/minidns-client/src/test/java/de/measite/minidns/DNSNameTest.java b/minidns-core/src/test/java/de/measite/minidns/DNSNameTest.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/DNSNameTest.java
rename to minidns-core/src/test/java/de/measite/minidns/DNSNameTest.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/dnslabel/DNSLabelTest.java b/minidns-core/src/test/java/de/measite/minidns/dnslabel/DNSLabelTest.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/dnslabel/DNSLabelTest.java
rename to minidns-core/src/test/java/de/measite/minidns/dnslabel/DNSLabelTest.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/record/RecordsTest.java b/minidns-core/src/test/java/de/measite/minidns/record/RecordsTest.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/record/RecordsTest.java
rename to minidns-core/src/test/java/de/measite/minidns/record/RecordsTest.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/util/Base32Test.java b/minidns-core/src/test/java/de/measite/minidns/util/Base32Test.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/util/Base32Test.java
rename to minidns-core/src/test/java/de/measite/minidns/util/Base32Test.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/util/Base64Test.java b/minidns-core/src/test/java/de/measite/minidns/util/Base64Test.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/util/Base64Test.java
rename to minidns-core/src/test/java/de/measite/minidns/util/Base64Test.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/util/InetAddressUtilTest.java b/minidns-core/src/test/java/de/measite/minidns/util/InetAddressUtilTest.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/util/InetAddressUtilTest.java
rename to minidns-core/src/test/java/de/measite/minidns/util/InetAddressUtilTest.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/util/NameUtilTest.java b/minidns-core/src/test/java/de/measite/minidns/util/NameUtilTest.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/util/NameUtilTest.java
rename to minidns-core/src/test/java/de/measite/minidns/util/NameUtilTest.java
diff --git a/minidns-client/src/test/java/de/measite/minidns/util/SrvUtilTest.java b/minidns-core/src/test/java/de/measite/minidns/util/SrvUtilTest.java
similarity index 100%
rename from minidns-client/src/test/java/de/measite/minidns/util/SrvUtilTest.java
rename to minidns-core/src/test/java/de/measite/minidns/util/SrvUtilTest.java
diff --git a/minidns-client/src/test/resources/de/measite/minidns/codinghorror-txt b/minidns-core/src/test/resources/de/measite/minidns/codinghorror-txt
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/codinghorror-txt
rename to minidns-core/src/test/resources/de/measite/minidns/codinghorror-txt
diff --git a/minidns-client/src/test/resources/de/measite/minidns/com-ds-rrsig b/minidns-core/src/test/resources/de/measite/minidns/com-ds-rrsig
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/com-ds-rrsig
rename to minidns-core/src/test/resources/de/measite/minidns/com-ds-rrsig
diff --git a/minidns-client/src/test/resources/de/measite/minidns/com-ns b/minidns-core/src/test/resources/de/measite/minidns/com-ns
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/com-ns
rename to minidns-core/src/test/resources/de/measite/minidns/com-ns
diff --git a/minidns-client/src/test/resources/de/measite/minidns/com-nsec3 b/minidns-core/src/test/resources/de/measite/minidns/com-nsec3
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/com-nsec3
rename to minidns-core/src/test/resources/de/measite/minidns/com-nsec3
diff --git a/minidns-client/src/test/resources/de/measite/minidns/example-nsec b/minidns-core/src/test/resources/de/measite/minidns/example-nsec
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/example-nsec
rename to minidns-core/src/test/resources/de/measite/minidns/example-nsec
diff --git a/minidns-client/src/test/resources/de/measite/minidns/gmail-mx b/minidns-core/src/test/resources/de/measite/minidns/gmail-mx
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/gmail-mx
rename to minidns-core/src/test/resources/de/measite/minidns/gmail-mx
diff --git a/minidns-client/src/test/resources/de/measite/minidns/google-aaaa b/minidns-core/src/test/resources/de/measite/minidns/google-aaaa
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/google-aaaa
rename to minidns-core/src/test/resources/de/measite/minidns/google-aaaa
diff --git a/minidns-client/src/test/resources/de/measite/minidns/gpn-srv b/minidns-core/src/test/resources/de/measite/minidns/gpn-srv
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/gpn-srv
rename to minidns-core/src/test/resources/de/measite/minidns/gpn-srv
diff --git a/minidns-client/src/test/resources/de/measite/minidns/oracle-soa b/minidns-core/src/test/resources/de/measite/minidns/oracle-soa
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/oracle-soa
rename to minidns-core/src/test/resources/de/measite/minidns/oracle-soa
diff --git a/minidns-client/src/test/resources/de/measite/minidns/root-dnskey b/minidns-core/src/test/resources/de/measite/minidns/root-dnskey
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/root-dnskey
rename to minidns-core/src/test/resources/de/measite/minidns/root-dnskey
diff --git a/minidns-client/src/test/resources/de/measite/minidns/sun-a b/minidns-core/src/test/resources/de/measite/minidns/sun-a
similarity index 100%
rename from minidns-client/src/test/resources/de/measite/minidns/sun-a
rename to minidns-core/src/test/resources/de/measite/minidns/sun-a
diff --git a/settings.gradle b/settings.gradle
index 78a7fc8e..ca59a4d1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,6 +3,7 @@
 // name of the root directory
 rootProject.name = 'MiniDNS'
 
+include 'minidns-core'
 include 'minidns-client'
 include 'minidns-async'
 include 'minidns-iterative-resolver'