diff --git a/leigh-blockchain-dsrv/build.gradle b/leigh-blockchain-dsrv/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..e71157ed421098a2305a3df46707adf335a30432
--- /dev/null
+++ b/leigh-blockchain-dsrv/build.gradle
@@ -0,0 +1,22 @@
+plugins {
+    id 'java'
+    id 'java-library'
+    id 'application'
+}
+
+group 'leigh'
+version '16.0'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    api project(':leigh-blockchain')
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+}
+
+test {
+    useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/leigh-dnsd/build.gradle b/leigh-infra-dnsd/build.gradle
similarity index 100%
rename from leigh-dnsd/build.gradle
rename to leigh-infra-dnsd/build.gradle
diff --git a/leigh-dnsd/src/main/java/leigh/dnsd/DNSDaemon.java b/leigh-infra-dnsd/src/main/java/leigh/infra/dnsd/DNSDaemon.java
similarity index 94%
rename from leigh-dnsd/src/main/java/leigh/dnsd/DNSDaemon.java
rename to leigh-infra-dnsd/src/main/java/leigh/infra/dnsd/DNSDaemon.java
index dc508936c2965fd80e2b8ea5c6458bcf08280390..679488ac873d961cc6c89a7196001276e4dd118d 100644
--- a/leigh-dnsd/src/main/java/leigh/dnsd/DNSDaemon.java
+++ b/leigh-infra-dnsd/src/main/java/leigh/infra/dnsd/DNSDaemon.java
@@ -1,4 +1,4 @@
-package leigh.dnsd;
+package leigh.infra.dnsd;
 
 import leigh.mecha.log.MechaLogger;
 import leigh.mecha.log.MechaLoggerFactory;
diff --git a/leigh-dnsd/src/main/java/leigh/dnsd/DNSService.java b/leigh-infra-dnsd/src/main/java/leigh/infra/dnsd/DNSService.java
similarity index 92%
rename from leigh-dnsd/src/main/java/leigh/dnsd/DNSService.java
rename to leigh-infra-dnsd/src/main/java/leigh/infra/dnsd/DNSService.java
index 11eb65a89ef4a6e623a162ee063ddd50fc57025f..9c8069a8b8c0473291a30bdcd1cf551eeee2703e 100644
--- a/leigh-dnsd/src/main/java/leigh/dnsd/DNSService.java
+++ b/leigh-infra-dnsd/src/main/java/leigh/infra/dnsd/DNSService.java
@@ -1,4 +1,4 @@
-package leigh.dnsd;
+package leigh.infra.dnsd;
 
 import leigh.mecha.log.MechaLogger;
 import leigh.mecha.log.MechaLoggerFactory;
@@ -46,7 +46,7 @@ public class DNSService implements Runnable {
             logger.info("local query");
             reply = new Message(request.getHeader().getID());
             reply.addRecord(request.getQuestion(), Section.QUESTION);
-            reply.addRecord(Record.fromString(Name.root, Type.A, DClass.IN, 86400, "1.2.3.4", Name.root),
+            reply.addRecord(Record.fromString(request.getQuestion().getName(), Type.A, DClass.IN, 86400, "1.2.3.4", Name.root),
                     Section.ANSWER);
         } else {
             logger.info("recursed query");
diff --git a/leigh-dnsd/src/test/java/leigh/dnsd/TestResolver.java b/leigh-infra-dnsd/src/test/java/leigh/infra/dnsd/TestResolver.java
similarity index 99%
rename from leigh-dnsd/src/test/java/leigh/dnsd/TestResolver.java
rename to leigh-infra-dnsd/src/test/java/leigh/infra/dnsd/TestResolver.java
index 4e06eddf82dfe0ab9a4a87a10f438c3dcd0e9b56..698357df5ad98bd7e36f8ed0d920143c31c1834e 100644
--- a/leigh-dnsd/src/test/java/leigh/dnsd/TestResolver.java
+++ b/leigh-infra-dnsd/src/test/java/leigh/infra/dnsd/TestResolver.java
@@ -1,4 +1,4 @@
-package leigh.dnsd;
+package leigh.infra.dnsd;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/settings.gradle b/settings.gradle
index 0a27bb962ca8b17e667994a154aef1aa2c988a85..04fda5d705f38b11207f7e4c5c753c5f13142549 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -87,5 +87,4 @@ include 'leigh-minecraft-link-quests'
 include 'leigh-blockchain'
 include 'leigh-inkan'
 include 'leigh-blockchain-blocktail'
-include 'leigh-dnsd'
-
+include 'leigh-infra-dnsd'
\ No newline at end of file