91 files changed, 267 insertions, 164 deletions

diff --git a/bootstrap b/bootstrap
index b635132a0..5e3185442 100755
--- a/bootstrap
+++ b/bootstrap
@@ -148,7 +148,7 @@ gana_update()
       echo "Creating default TLDs"
       cd ../gnu-name-system-default-tlds && \
          make >/dev/null && \
-         cp tlds.conf ../../../src/gns || exit 1
+         cp tlds.conf ../../../src/service/gns || exit 1
 
       # Signatures
       echo "Updating GNUnet signatures"
diff --git a/configure.ac b/configure.ac
index 2d4d8cff3..f19393f98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1240,6 +1240,7 @@ src/lib/sq/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/dhtu/Makefile
+src/plugin/gns/Makefile
 src/plugin/gnsrecord/Makefile
 src/plugin/namecache/Makefile
 src/plugin/namestore/Makefile
@@ -1258,6 +1259,9 @@ src/service/dht/Makefile
 src/service/dht/dht.conf
 src/service/dns/Makefile
 src/service/dns/dns.conf
+src/service/gns/Makefile
+src/service/gns/gns.conf
+src/service/gns/nss/Makefile
 src/service/hostlist/Makefile
 src/service/identity/Makefile
 src/service/identity/identity.conf
@@ -1291,7 +1295,10 @@ src/service/transport/transport.conf
 src/service/util/Makefile
 src/service/vpn/Makefile
 src/service/vpn/vpn.conf
+src/service/zonemaster/Makefile
+src/service/zonemaster/zonemaster.conf
 src/rest-plugin/Makefile
+src/rest-plugin/gns/Makefile
 src/rest-plugin/identity/Makefile
 src/rest-plugin/rest/Makefile
 src/cli/Makefile
@@ -1300,6 +1307,7 @@ src/cli/cadet/Makefile
 src/cli/core/Makefile
 src/cli/datastore/Makefile
 src/cli/dht/Makefile
+src/cli/gns/Makefile
 src/cli/namecache/Makefile
 src/cli/namestore/Makefile
 src/cli/nat/Makefile
@@ -1331,15 +1339,10 @@ src/conversation/conversation.conf
 src/exit/Makefile
 src/fs/Makefile
 src/fs/fs.conf
-src/gns/Makefile
-src/gns/gns.conf
-src/gns/nss/Makefile
 src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
 src/pt/Makefile
-src/zonemaster/Makefile
-src/zonemaster/zonemaster.conf
 src/reclaim/Makefile
 src/messenger/Makefile
 src/messenger/messenger.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f189a096..3f6cdd3ce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,6 +6,7 @@ src/cli/dht/gnunet-dht-get.c
 src/cli/dht/gnunet-dht-hello.c
 src/cli/dht/gnunet-dht-monitor.c
 src/cli/dht/gnunet-dht-put.c
+src/cli/gns/gnunet-gns.c
 src/cli/identity/gnunet-identity.c
 src/cli/namecache/gnunet-namecache.c
 src/cli/namestore/gnunet-namestore-dbtool.c
@@ -132,22 +133,6 @@ src/fs/gnunet-unindex.c
 src/fs/meta_data.c
 src/fs/plugin_block_fs.c
 src/gana/gnunet-error-codes/gnunet_error_codes.c
-src/gns/gns_api.c
-src/gns/gns_tld_api.c
-src/gns/gnunet-bcd.c
-src/gns/gnunet-dns2gns.c
-src/gns/gnunet-gns-benchmark.c
-src/gns/gnunet-gns-import.c
-src/gns/gnunet-gns-proxy.c
-src/gns/gnunet-gns.c
-src/gns/gnunet-service-gns.c
-src/gns/gnunet-service-gns_interceptor.c
-src/gns/gnunet-service-gns_resolver.c
-src/gns/nss/nss_gns.c
-src/gns/nss/nss_gns_query.c
-src/gns/plugin_block_gns.c
-src/gns/plugin_gnsrecord_gns.c
-src/gns/plugin_rest_gns.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
 src/lib/curl/curl.c
@@ -288,6 +273,8 @@ src/plugin/block/plugin_block_test.c
 src/plugin/dhtu/plugin_dhtu_gnunet.c
 src/plugin/dhtu/plugin_dhtu_ip.c
 src/plugin/dhtu/testing_dhtu_cmd_send.c
+src/plugin/gns/plugin_block_gns.c
+src/plugin/gns/plugin_gnsrecord_gns.c
 src/plugin/gnsrecord/plugin_gnsrecord_dns.c
 src/plugin/namecache/plugin_namecache_flat.c
 src/plugin/namecache/plugin_namecache_postgres.c
@@ -318,6 +305,7 @@ src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/reclaim/reclaim_attribute.c
 src/reclaim/reclaim_credential.c
+src/rest-plugin/gns/plugin_rest_gns.c
 src/rest-plugin/identity/plugin_rest_identity.c
 src/rest-plugin/rest/plugin_rest_config.c
 src/rest-plugin/rest/plugin_rest_copying.c
@@ -377,6 +365,18 @@ src/service/dns/gnunet-helper-dns.c
 src/service/dns/gnunet-service-dns.c
 src/service/dns/gnunet-zonewalk.c
 src/service/dns/plugin_block_dns.c
+src/service/gns/gns_api.c
+src/service/gns/gns_tld_api.c
+src/service/gns/gnunet-bcd.c
+src/service/gns/gnunet-dns2gns.c
+src/service/gns/gnunet-gns-benchmark.c
+src/service/gns/gnunet-gns-import.c
+src/service/gns/gnunet-gns-proxy.c
+src/service/gns/gnunet-service-gns.c
+src/service/gns/gnunet-service-gns_interceptor.c
+src/service/gns/gnunet-service-gns_resolver.c
+src/service/gns/nss/nss_gns.c
+src/service/gns/nss/nss_gns_query.c
 src/service/hostlist/gnunet-daemon-hostlist.c
 src/service/hostlist/gnunet-daemon-hostlist_client.c
 src/service/hostlist/gnunet-daemon-hostlist_server.c
@@ -495,7 +495,7 @@ src/service/util/gnunet-service-resolver.c
 src/service/vpn/gnunet-helper-vpn.c
 src/service/vpn/gnunet-service-vpn.c
 src/service/vpn/vpn_api.c
-src/zonemaster/gnunet-service-zonemaster.c
+src/service/zonemaster/gnunet-service-zonemaster.c
 src/fs/fs_api.h
 src/include/gnunet_json_lib.h
 src/include/gnunet_pq_lib.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f55c535bf..3cc409f31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  gns \
-  zonemaster \
   $(CONVERSATION_DIR) \
   fs \
   exit \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index c7682bb36..e968c0bce 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -12,4 +12,5 @@ SUBDIRS = \
         namestore \
         revocation \
         vpn \
+        gns \
         cadet
diff --git a/src/cli/gns/.gitignore b/src/cli/gns/.gitignore
new file mode 100644
index 000000000..23bd1d13b
--- /dev/null
+++ b/src/cli/gns/.gitignore
@@ -0,0 +1,2 @@
+gnunet-gns
+gnunet-gns-proxy-setup-ca
diff --git a/src/cli/gns/Makefile.am b/src/cli/gns/Makefile.am
new file mode 100644
index 000000000..0b41fbb19
--- /dev/null
+++ b/src/cli/gns/Makefile.am
@@ -0,0 +1,98 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgdata_DATA = \
+  gnunet-gns-proxy-ca.template
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir = $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+bin_PROGRAMS = \
+  gnunet-gns
+
+bin_SCRIPTS = \
+  gnunet-gns-proxy-setup-ca
+
+gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile
+        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca
+        @chmod +x gnunet-gns-proxy-setup-ca
+
+test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile
+        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh
+        @chmod +x test_gnunet_gns.sh
+
+CLEANFILES = test_gnunet_gns.sh
+
+gnunet_gns_SOURCES = \
+ gnunet-gns.c
+gnunet_gns_LDADD = \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LIBIDN) $(LIBIDN2) \
+  $(GN_LIBINTL)
+
+check_SCRIPTS = \
+   test_gns_lookup.sh \
+   test_gns_config_lookup.sh \
+   test_gns_ipv6_lookup.sh\
+   test_gns_txt_lookup.sh\
+   test_gns_caa_lookup.sh\
+   test_gns_mx_lookup.sh \
+   test_gns_gns2dns_lookup.sh \
+   test_gns_gns2dns_zkey_lookup.sh \
+   test_gns_gns2dns_cname_lookup.sh \
+   test_gns_dht_lookup.sh\
+   test_gns_delegated_lookup.sh \
+   test_gns_at_lookup.sh\
+   test_gns_zkey_lookup.sh\
+   test_gns_rel_expiration.sh\
+   test_gns_soa_lookup.sh\
+   test_gns_revocation.sh\
+   test_gns_redirect_lookup.sh
+
+EXTRA_DIST = \
+  test_gns_defaults.conf \
+  test_gns_lookup.conf \
+  test_gns_proxy.conf \
+  test_gns_simple_lookup.conf \
+  openssl.cnf \
+  gnunet-gns-proxy-setup-ca.in \
+  zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \
+  zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
+  zonefiles/test_zonekey \
+  test_gns_lookup.sh \
+  test_gns_config_lookup.sh \
+  test_gns_ipv6_lookup.sh\
+  test_gns_txt_lookup.sh\
+  test_gns_caa_lookup.sh\
+  test_gns_mx_lookup.sh \
+  test_gns_gns2dns_lookup.sh \
+  test_gns_gns2dns_zkey_lookup.sh \
+  test_gns_gns2dns_cname_lookup.sh \
+  test_gns_dht_lookup.sh\
+  test_gns_delegated_lookup.sh \
+  test_gns_at_lookup.sh\
+  test_gns_zkey_lookup.sh\
+  test_gns_rel_expiration.sh\
+  test_gns_soa_lookup.sh\
+  test_gns_revocation.sh\
+  test_gns_redirect_lookup.sh\
+  test_proxy.sh\
+        $(pkgdata_DATA) \
+  test_gnunet_gns.sh.in
+
+if ENABLE_TEST_RUN
+if HAVE_SQLITE
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+ TESTS = $(check_SCRIPTS)
+endif
+endif
diff --git a/src/gns/gnunet-gns-proxy-ca.template b/src/cli/gns/gnunet-gns-proxy-ca.template
index b1a0d16fd..b1a0d16fd 100644
--- a/src/gns/gnunet-gns-proxy-ca.template
+++ b/src/cli/gns/gnunet-gns-proxy-ca.template
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/cli/gns/gnunet-gns-proxy-setup-ca.in
index b3ebfd11d..b3ebfd11d 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/cli/gns/gnunet-gns-proxy-setup-ca.in
diff --git a/src/gns/gnunet-gns.c b/src/cli/gns/gnunet-gns.c
index c71676a08..c71676a08 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/cli/gns/gnunet-gns.c
diff --git a/src/gns/test_dns2gns.sh b/src/cli/gns/test_dns2gns.sh
index 295bcc766..295bcc766 100755
--- a/src/gns/test_dns2gns.sh
+++ b/src/cli/gns/test_dns2gns.sh
diff --git a/src/gns/test_gns_at_lookup.sh b/src/cli/gns/test_gns_at_lookup.sh
index 6a2c958de..6a2c958de 100755
--- a/src/gns/test_gns_at_lookup.sh
+++ b/src/cli/gns/test_gns_at_lookup.sh
diff --git a/src/gns/test_gns_caa_lookup.sh b/src/cli/gns/test_gns_caa_lookup.sh
index fb488f47b..fb488f47b 100755
--- a/src/gns/test_gns_caa_lookup.sh
+++ b/src/cli/gns/test_gns_caa_lookup.sh
diff --git a/src/gns/test_gns_config_lookup.sh b/src/cli/gns/test_gns_config_lookup.sh
index bda08f87b..bda08f87b 100755
--- a/src/gns/test_gns_config_lookup.sh
+++ b/src/cli/gns/test_gns_config_lookup.sh
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/cli/gns/test_gns_delegated_lookup.sh
index 5105abdb5..5105abdb5 100755
--- a/src/gns/test_gns_delegated_lookup.sh
+++ b/src/cli/gns/test_gns_delegated_lookup.sh
diff --git a/src/gns/test_gns_dht_lookup.sh b/src/cli/gns/test_gns_dht_lookup.sh
index da87d8477..da87d8477 100755
--- a/src/gns/test_gns_dht_lookup.sh
+++ b/src/cli/gns/test_gns_dht_lookup.sh
diff --git a/src/gns/test_gns_gns2dns_cname_lookup.sh b/src/cli/gns/test_gns_gns2dns_cname_lookup.sh
index c33c9d132..c33c9d132 100755
--- a/src/gns/test_gns_gns2dns_cname_lookup.sh
+++ b/src/cli/gns/test_gns_gns2dns_cname_lookup.sh
diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/cli/gns/test_gns_gns2dns_lookup.sh
index 43a4756d3..43a4756d3 100755
--- a/src/gns/test_gns_gns2dns_lookup.sh
+++ b/src/cli/gns/test_gns_gns2dns_lookup.sh
diff --git a/src/gns/test_gns_gns2dns_zkey_lookup.sh b/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh
index 03549314e..03549314e 100755
--- a/src/gns/test_gns_gns2dns_zkey_lookup.sh
+++ b/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh
diff --git a/src/gns/test_gns_ipv6_lookup.sh b/src/cli/gns/test_gns_ipv6_lookup.sh
index 31e662f68..31e662f68 100755
--- a/src/gns/test_gns_ipv6_lookup.sh
+++ b/src/cli/gns/test_gns_ipv6_lookup.sh
diff --git a/src/gns/test_gns_lookup.sh b/src/cli/gns/test_gns_lookup.sh
index 92dfae28b..92dfae28b 100755
--- a/src/gns/test_gns_lookup.sh
+++ b/src/cli/gns/test_gns_lookup.sh
diff --git a/src/gns/test_gns_multiple_record_lookup.sh b/src/cli/gns/test_gns_multiple_record_lookup.sh
index 2d00945d6..2d00945d6 100755
--- a/src/gns/test_gns_multiple_record_lookup.sh
+++ b/src/cli/gns/test_gns_multiple_record_lookup.sh
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/cli/gns/test_gns_mx_lookup.sh
index 6f2b8192d..6f2b8192d 100755
--- a/src/gns/test_gns_mx_lookup.sh
+++ b/src/cli/gns/test_gns_mx_lookup.sh
diff --git a/src/gns/test_gns_quickupdate.sh b/src/cli/gns/test_gns_quickupdate.sh
index eac69103d..eac69103d 100755
--- a/src/gns/test_gns_quickupdate.sh
+++ b/src/cli/gns/test_gns_quickupdate.sh
diff --git a/src/gns/test_gns_redirect_lookup.sh b/src/cli/gns/test_gns_redirect_lookup.sh
index 90729713d..90729713d 100755
--- a/src/gns/test_gns_redirect_lookup.sh
+++ b/src/cli/gns/test_gns_redirect_lookup.sh
diff --git a/src/gns/test_gns_rel_expiration.sh b/src/cli/gns/test_gns_rel_expiration.sh
index a240cfd0f..a240cfd0f 100755
--- a/src/gns/test_gns_rel_expiration.sh
+++ b/src/cli/gns/test_gns_rel_expiration.sh
diff --git a/src/gns/test_gns_revocation.sh b/src/cli/gns/test_gns_revocation.sh
index 2253adcb4..2253adcb4 100755
--- a/src/gns/test_gns_revocation.sh
+++ b/src/cli/gns/test_gns_revocation.sh
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/cli/gns/test_gns_soa_lookup.sh
index a697782bb..a697782bb 100755
--- a/src/gns/test_gns_soa_lookup.sh
+++ b/src/cli/gns/test_gns_soa_lookup.sh
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/cli/gns/test_gns_txt_lookup.sh
index 4e36e8ad8..4e36e8ad8 100755
--- a/src/gns/test_gns_txt_lookup.sh
+++ b/src/cli/gns/test_gns_txt_lookup.sh
diff --git a/src/gns/test_gns_zkey_lookup.sh b/src/cli/gns/test_gns_zkey_lookup.sh
index 3d4aefc7c..3d4aefc7c 100755
--- a/src/gns/test_gns_zkey_lookup.sh
+++ b/src/cli/gns/test_gns_zkey_lookup.sh
diff --git a/src/contrib/service/abd/Makefile.am b/src/contrib/service/abd/Makefile.am
index d08a6a4a7..f199d72ed 100644
--- a/src/contrib/service/abd/Makefile.am
+++ b/src/contrib/service/abd/Makefile.am
@@ -65,7 +65,7 @@ gnunet_service_abd_SOURCES = \
 gnunet_service_abd_LDADD = \
         libgnunetabd.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-        $(top_builddir)/src/gns/libgnunetgns.la \
+        $(top_builddir)/src/service/gns/libgnunetgns.la \
         $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 720d543ca..b573208e6 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -69,7 +69,7 @@ libgnunetconversation_la_SOURCES = \
   conversation_api_call.c \
   conversation.h
 libgnunetconversation_la_LIBADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
@@ -196,7 +196,7 @@ gnunet_conversation_LDADD = \
   libgnunetmicrophone.la \
   libgnunetspeaker.la \
   libgnunetconversation.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 01a48de85..5b1464d89 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -4,4 +4,5 @@ SUBDIRS = \
         dhtu \
         namecache \
         namestore \
-        revocation
+        revocation \
+        gns
diff --git a/src/plugin/gns/Makefile.am b/src/plugin/gns/Makefile.am
new file mode 100644
index 000000000..ebbb9aa51
--- /dev/null
+++ b/src/plugin/gns/Makefile.am
@@ -0,0 +1,61 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if HAVE_LIBIDN
+  LIBIDN= -lidn
+else
+  LIBIDN=
+endif
+
+if HAVE_LIBIDN2
+  LIBIDN2= -lidn2
+else
+  LIBIDN2=
+endif
+
+USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir = $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_gns.la \
+  libgnunet_plugin_gnsrecord_gns.la
+
+
+libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
+  plugin_gnsrecord_gns.c
+libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_block_gns_la_SOURCES = \
+  plugin_block_gns.c
+libgnunet_plugin_block_gns_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
+libgnunet_plugin_block_gns_la_LDFLAGS = \
+  $(GN_LIBINTL) \
+  $(GN_PLUGIN_LDFLAGS)
+
+if ENABLE_TEST_RUN
+if HAVE_SQLITE
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+ TESTS = $(check_SCRIPTS)
+endif
+endif
diff --git a/src/gns/plugin_block_gns.c b/src/plugin/gns/plugin_block_gns.c
index 75e182092..75e182092 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/plugin/gns/plugin_block_gns.c
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/plugin/gns/plugin_gnsrecord_gns.c
index 65587172d..65587172d 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/plugin/gns/plugin_gnsrecord_gns.c
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 406aad081..e5603d662 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -80,7 +80,7 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
   libgnunetreclaim.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
   $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \
@@ -126,7 +126,7 @@ gnunet_service_reclaim_LDADD = \
  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
  libgnunetreclaim.la \
- $(top_builddir)/src/gns/libgnunetgns.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
  $(GN_LIBINTL)
 
 libgnunetreclaim_la_SOURCES = \
@@ -151,7 +151,7 @@ libgnunetdid_la_SOURCES = \
   did_core.c
 libgnunetdid_la_LIBADD = \
         $(top_builddir)/src/lib/util/libgnunetutil.la \
-        $(top_builddir)/src/gns/libgnunetgns.la \
+        $(top_builddir)/src/service/gns/libgnunetgns.la \
         $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
         $(top_builddir)/src/service/identity/libgnunetidentity.la \
         $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
@@ -216,7 +216,7 @@ gnunet_did_SOURCES = \
         gnunet-did.c
 gnunet_did_LDADD = \
         $(top_builddir)/src/lib/util/libgnunetutil.la \
-        $(top_builddir)/src/gns/libgnunetgns.la \
+        $(top_builddir)/src/service/gns/libgnunetgns.la \
         $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
         $(top_builddir)/src/service/identity/libgnunetidentity.la \
         $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
@@ -228,7 +228,7 @@ test_did_helper_SOURCES = \
   test_did_helper.c
 test_did_helper_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-        $(top_builddir)/src/gns/libgnunetgns.la \
+        $(top_builddir)/src/service/gns/libgnunetgns.la \
         $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
         $(top_builddir)/src/service/identity/libgnunetidentity.la \
         $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am
index fb74b9f2e..4b1b71bb7 100644
--- a/src/rest-plugin/Makefile.am
+++ b/src/rest-plugin/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = \
         rest \
-        identity
+        identity \
+        gns
diff --git a/src/rest-plugin/gns/Makefile.am b/src/rest-plugin/gns/Makefile.am
new file mode 100644
index 000000000..48b278df6
--- /dev/null
+++ b/src/rest-plugin/gns/Makefile.am
@@ -0,0 +1,61 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if HAVE_LIBIDN
+  LIBIDN= -lidn
+else
+  LIBIDN=
+endif
+
+if HAVE_LIBIDN2
+  LIBIDN2= -lidn2
+else
+  LIBIDN2=
+endif
+
+USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir = $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+REST_PLUGIN = libgnunet_plugin_rest_gns.la
+
+plugin_LTLIBRARIES = \
+  $(REST_PLUGIN)
+
+
+libgnunet_plugin_rest_gns_la_SOURCES = \
+  plugin_rest_gns.c
+libgnunet_plugin_rest_gns_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/rest/libgnunetrest.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson $(MHD_LIBS)
+libgnunet_plugin_rest_gns_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_gns_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+
+
+check_SCRIPTS = \
+  test_plugin_rest_gns.sh
+
+EXTRA_DIST = \
+  test_plugin_rest_gns.sh
+
+if ENABLE_TEST_RUN
+if HAVE_SQLITE
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+ TESTS = $(check_SCRIPTS)
+endif
+endif
diff --git a/src/gns/plugin_rest_gns.c b/src/rest-plugin/gns/plugin_rest_gns.c
index 659b77493..659b77493 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/rest-plugin/gns/plugin_rest_gns.c
diff --git a/src/gns/test_plugin_rest_gns.sh b/src/rest-plugin/gns/test_plugin_rest_gns.sh
index 3bcfb5a08..3bcfb5a08 100755
--- a/src/gns/test_plugin_rest_gns.sh
+++ b/src/rest-plugin/gns/test_plugin_rest_gns.sh
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index a8738997f..34ae7945f 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -24,5 +24,7 @@ SUBDIRS = \
   setu \
   regex \
   revocation \
-        vpn
+        vpn \
+  gns \
+  zonemaster
 
diff --git a/src/gns/.gitignore b/src/service/gns/.gitignore
index 3bbb2eb3d..3bbb2eb3d 100644
--- a/src/gns/.gitignore
+++ b/src/service/gns/.gitignore
diff --git a/src/gns/Makefile.am b/src/service/gns/Makefile.am
index 6907df0ed..a169b43a6 100644
--- a/src/gns/Makefile.am
+++ b/src/service/gns/Makefile.am
@@ -7,9 +7,6 @@ endif
 
 SUBDIRS = . $(NSS_SUBDIR)
 
-pkgdata_DATA = \
-  gnunet-gns-proxy-ca.template
-
 if HAVE_LIBIDN
   LIBIDN= -lidn
 else
@@ -46,9 +43,6 @@ libexec_PROGRAMS = \
   gnunet-service-gns \
   gnunet-dns2gns
 
-bin_PROGRAMS = \
-  gnunet-gns
-
 noinst_PROGRAMS = \
   gnunet-gns-benchmark
 
@@ -60,64 +54,6 @@ if HAVE_GNUTLS
 libexec_PROGRAMS += gnunet-gns-proxy
 endif
 
-REST_PLUGIN = libgnunet_plugin_rest_gns.la
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_gns.la \
-  libgnunet_plugin_gnsrecord_gns.la \
-  $(REST_PLUGIN)
-
-
-bin_SCRIPTS = \
-  gnunet-gns-proxy-setup-ca
-
-gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca
-        @chmod +x gnunet-gns-proxy-setup-ca
-
-test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh
-        @chmod +x test_gnunet_gns.sh
-
-CLEANFILES = test_gnunet_gns.sh
-
-libgnunet_plugin_rest_gns_la_SOURCES = \
-  plugin_rest_gns.c
-libgnunet_plugin_rest_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_gns_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
-  plugin_gnsrecord_gns.c
-libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-gnunet_gns_SOURCES = \
- gnunet-gns.c
-gnunet_gns_LDADD = \
-  libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBIDN) $(LIBIDN2) \
-  $(GN_LIBINTL)
-
 gnunet_gns_benchmark_SOURCES = \
  gnunet-gns-benchmark.c
 gnunet_gns_benchmark_LDADD = \
@@ -222,81 +158,19 @@ libgnunetgns_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
 
-libgnunet_plugin_block_gns_la_SOURCES = \
-  plugin_block_gns.c
-libgnunet_plugin_block_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
-libgnunet_plugin_block_gns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_PLUGIN_LDFLAGS)
-
 if HAVE_GNUTLS
 check_PROGRAMS = \
   test_gns_proxy
 endif
 
-check_SCRIPTS = \
-   test_gns_lookup.sh \
-   test_gns_config_lookup.sh \
-   test_gns_ipv6_lookup.sh\
-   test_gns_txt_lookup.sh\
-   test_gns_caa_lookup.sh\
-   test_gns_mx_lookup.sh \
-   test_gns_gns2dns_lookup.sh \
-   test_gns_gns2dns_zkey_lookup.sh \
-   test_gns_gns2dns_cname_lookup.sh \
-   test_gns_dht_lookup.sh\
-   test_gns_delegated_lookup.sh \
-   test_gns_at_lookup.sh\
-   test_gns_zkey_lookup.sh\
-   test_gns_rel_expiration.sh\
-   test_gns_soa_lookup.sh\
-   test_gns_revocation.sh\
-   test_gns_redirect_lookup.sh
-
 if HAVE_GNUTLS_CURL
-check_SCRIPTS += \
+check_SCRIPTS = \
   test_proxy.sh
 endif
-check_SCRIPTS += \
-  test_plugin_rest_gns.sh
 
 EXTRA_DIST = \
-  test_gns_defaults.conf \
-  test_gns_lookup.conf \
   test_gns_proxy.conf \
-  test_gns_simple_lookup.conf \
-  openssl.cnf \
-  gnunet-gns-proxy-setup-ca.in \
-  zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \
-  zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
-  zonefiles/test_zonekey \
-  test_gns_lookup.sh \
-  test_gns_config_lookup.sh \
-  test_gns_ipv6_lookup.sh\
-  test_gns_txt_lookup.sh\
-  test_gns_caa_lookup.sh\
-  test_gns_mx_lookup.sh \
-  test_gns_gns2dns_lookup.sh \
-  test_gns_gns2dns_zkey_lookup.sh \
-  test_gns_gns2dns_cname_lookup.sh \
-  test_gns_dht_lookup.sh\
-  test_gns_delegated_lookup.sh \
-  test_gns_at_lookup.sh\
-  test_gns_zkey_lookup.sh\
-  test_gns_rel_expiration.sh\
-  test_gns_soa_lookup.sh\
-  test_gns_revocation.sh\
-  test_gns_redirect_lookup.sh\
-  test_proxy.sh\
-  test_plugin_rest_gns.sh\
-  test_proxy.sh \
-  $(pkgdata_DATA) \
-  test_gnunet_gns.sh.in
+  test_proxy.sh
 
 if ENABLE_TEST_RUN
 if HAVE_SQLITE
diff --git a/src/gns/gns.conf.in b/src/service/gns/gns.conf.in
index d8a27ec22..d8a27ec22 100644
--- a/src/gns/gns.conf.in
+++ b/src/service/gns/gns.conf.in
diff --git a/src/gns/gns.h b/src/service/gns/gns.h
index d882278f5..d882278f5 100644
--- a/src/gns/gns.h
+++ b/src/service/gns/gns.h
diff --git a/src/gns/gns_api.c b/src/service/gns/gns_api.c
index 0dc7580f9..0dc7580f9 100644
--- a/src/gns/gns_api.c
+++ b/src/service/gns/gns_api.c
diff --git a/src/gns/gns_api.h b/src/service/gns/gns_api.h
index 003955bdd..003955bdd 100644
--- a/src/gns/gns_api.h
+++ b/src/service/gns/gns_api.h
diff --git a/src/gns/gns_tld_api.c b/src/service/gns/gns_tld_api.c
index 1ea87fd97..1ea87fd97 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/service/gns/gns_tld_api.c
diff --git a/src/gns/gnunet-bcd.c b/src/service/gns/gnunet-bcd.c
index 0f7fb6507..0f7fb6507 100644
--- a/src/gns/gnunet-bcd.c
+++ b/src/service/gns/gnunet-bcd.c
diff --git a/src/gns/gnunet-dns2gns.c b/src/service/gns/gnunet-dns2gns.c
index 04d320c62..04d320c62 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/service/gns/gnunet-dns2gns.c
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/service/gns/gnunet-gns-benchmark.c
index b36a83f21..b36a83f21 100644
--- a/src/gns/gnunet-gns-benchmark.c
+++ b/src/service/gns/gnunet-gns-benchmark.c
diff --git a/src/gns/gnunet-gns-import.c b/src/service/gns/gnunet-gns-import.c
index 5d4602682..5d4602682 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/service/gns/gnunet-gns-import.c
diff --git a/src/gns/gnunet-gns-proxy.c b/src/service/gns/gnunet-gns-proxy.c
index b38f0a425..b38f0a425 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/service/gns/gnunet-gns-proxy.c
diff --git a/src/gns/gnunet-service-gns.c b/src/service/gns/gnunet-service-gns.c
index aaf82a557..aaf82a557 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/service/gns/gnunet-service-gns.c
diff --git a/src/gns/gnunet-service-gns.h b/src/service/gns/gnunet-service-gns.h
index 13e28349c..13e28349c 100644
--- a/src/gns/gnunet-service-gns.h
+++ b/src/service/gns/gnunet-service-gns.h
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/service/gns/gnunet-service-gns_interceptor.c
index f49d60b94..f49d60b94 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/service/gns/gnunet-service-gns_interceptor.c
diff --git a/src/gns/gnunet-service-gns_interceptor.h b/src/service/gns/gnunet-service-gns_interceptor.h
index 7f9733c2a..7f9733c2a 100644
--- a/src/gns/gnunet-service-gns_interceptor.h
+++ b/src/service/gns/gnunet-service-gns_interceptor.h
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/service/gns/gnunet-service-gns_resolver.c
index aa0189b15..aa0189b15 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/service/gns/gnunet-service-gns_resolver.c
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/service/gns/gnunet-service-gns_resolver.h
index 908af58e7..908af58e7 100644
--- a/src/gns/gnunet-service-gns_resolver.h
+++ b/src/service/gns/gnunet-service-gns_resolver.h
diff --git a/src/gns/gnunet_w32nsp_lib.h b/src/service/gns/gnunet_w32nsp_lib.h
index 9d19ff2aa..9d19ff2aa 100644
--- a/src/gns/gnunet_w32nsp_lib.h
+++ b/src/service/gns/gnunet_w32nsp_lib.h
diff --git a/src/gns/meson.build b/src/service/gns/meson.build
index b82694026..b82694026 100644
--- a/src/gns/meson.build
+++ b/src/service/gns/meson.build
diff --git a/src/gns/nss/Makefile.am b/src/service/gns/nss/Makefile.am
index af0a8a2e2..af0a8a2e2 100644
--- a/src/gns/nss/Makefile.am
+++ b/src/service/gns/nss/Makefile.am
diff --git a/src/gns/nss/map-file b/src/service/gns/nss/map-file
index 476d0ac3e..476d0ac3e 100644
--- a/src/gns/nss/map-file
+++ b/src/service/gns/nss/map-file
diff --git a/src/gns/nss/meson.build b/src/service/gns/nss/meson.build
index 7fd00ceb1..7fd00ceb1 100644
--- a/src/gns/nss/meson.build
+++ b/src/service/gns/nss/meson.build
diff --git a/src/gns/nss/nss_gns.c b/src/service/gns/nss/nss_gns.c
index b05cfff55..b05cfff55 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/service/gns/nss/nss_gns.c
diff --git a/src/gns/nss/nss_gns_query.c b/src/service/gns/nss/nss_gns_query.c
index 96e8e10da..96e8e10da 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/service/gns/nss/nss_gns_query.c
diff --git a/src/gns/nss/nss_gns_query.h b/src/service/gns/nss/nss_gns_query.h
index 43bf21646..43bf21646 100644
--- a/src/gns/nss/nss_gns_query.h
+++ b/src/service/gns/nss/nss_gns_query.h
diff --git a/src/gns/openssl.cnf b/src/service/gns/openssl.cnf
index a2561b9b2..a2561b9b2 100644
--- a/src/gns/openssl.cnf
+++ b/src/service/gns/openssl.cnf
diff --git a/src/gns/test_dns2gns.conf b/src/service/gns/test_dns2gns.conf
index f484d4114..f484d4114 100644
--- a/src/gns/test_dns2gns.conf
+++ b/src/service/gns/test_dns2gns.conf
diff --git a/src/gns/test_gns_defaults.conf b/src/service/gns/test_gns_defaults.conf
index 80a2f3c44..80a2f3c44 100644
--- a/src/gns/test_gns_defaults.conf
+++ b/src/service/gns/test_gns_defaults.conf
diff --git a/src/gns/test_gns_lookup.conf b/src/service/gns/test_gns_lookup.conf
index 322af0784..322af0784 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/service/gns/test_gns_lookup.conf
diff --git a/src/gns/test_gns_lookup_peer1.conf b/src/service/gns/test_gns_lookup_peer1.conf
index 69e2f0973..69e2f0973 100644
--- a/src/gns/test_gns_lookup_peer1.conf
+++ b/src/service/gns/test_gns_lookup_peer1.conf
diff --git a/src/gns/test_gns_lookup_peer2.conf b/src/service/gns/test_gns_lookup_peer2.conf
index 3de81d7f3..3de81d7f3 100644
--- a/src/gns/test_gns_lookup_peer2.conf
+++ b/src/service/gns/test_gns_lookup_peer2.conf
diff --git a/src/gns/test_gns_proxy.c b/src/service/gns/test_gns_proxy.c
index e09db5787..e09db5787 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/service/gns/test_gns_proxy.c
diff --git a/src/gns/test_gns_proxy.conf b/src/service/gns/test_gns_proxy.conf
index 3dfeacafe..3dfeacafe 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/service/gns/test_gns_proxy.conf
diff --git a/src/gns/test_gns_simple_lookup.conf b/src/service/gns/test_gns_simple_lookup.conf
index 374731377..374731377 100644
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/service/gns/test_gns_simple_lookup.conf
diff --git a/src/gns/test_gnunet_gns.sh.in b/src/service/gns/test_gnunet_gns.sh.in
index d0c07b4e4..d0c07b4e4 100755
--- a/src/gns/test_gnunet_gns.sh.in
+++ b/src/service/gns/test_gnunet_gns.sh.in
diff --git a/src/gns/test_proxy.sh b/src/service/gns/test_proxy.sh
index bb63a436e..bb63a436e 100755
--- a/src/gns/test_proxy.sh
+++ b/src/service/gns/test_proxy.sh
diff --git a/src/gns/tlds.conf b/src/service/gns/tlds.conf
index a600a3d66..a600a3d66 100644
--- a/src/gns/tlds.conf
+++ b/src/service/gns/tlds.conf
diff --git a/src/gns/w32resolver.h b/src/service/gns/w32resolver.h
index c404e37d3..c404e37d3 100644
--- a/src/gns/w32resolver.h
+++ b/src/service/gns/w32resolver.h
diff --git a/src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey b/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
index 895946037..895946037 100644
--- a/src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
+++ b/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
diff --git a/src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey b/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
index 3ef49f0ac..3ef49f0ac 100644
--- a/src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
+++ b/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
diff --git a/src/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey b/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
index 89e0b3a0a..89e0b3a0a 100644
--- a/src/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
+++ b/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
diff --git a/src/gns/zonefiles/test_zonekey b/src/service/gns/zonefiles/test_zonekey
index 870c56315..870c56315 100644
--- a/src/gns/zonefiles/test_zonekey
+++ b/src/service/gns/zonefiles/test_zonekey
diff --git a/src/service/testing/.gitignore b/src/service/testing/.gitignore
index d75315c79..a1e77a8e4 100644
--- a/src/service/testing/.gitignore
+++ b/src/service/testing/.gitignore
@@ -1,3 +1,4 @@
+test_testing_start_with_config
 list-keys
 gnunet-testing
 test_testing_peerstartup
diff --git a/src/zonemaster/.gitignore b/src/service/zonemaster/.gitignore
index cde57fa0a..cde57fa0a 100644
--- a/src/zonemaster/.gitignore
+++ b/src/service/zonemaster/.gitignore
diff --git a/src/zonemaster/Makefile.am b/src/service/zonemaster/Makefile.am
index 5a96afa83..5a96afa83 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/service/zonemaster/Makefile.am
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/service/zonemaster/gnunet-service-zonemaster.c
index 7c763576d..7c763576d 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/service/zonemaster/gnunet-service-zonemaster.c
diff --git a/src/zonemaster/meson.build b/src/service/zonemaster/meson.build
index 44c67edf2..44c67edf2 100644
--- a/src/zonemaster/meson.build
+++ b/src/service/zonemaster/meson.build
diff --git a/src/zonemaster/zonemaster.conf.in b/src/service/zonemaster/zonemaster.conf.in
index 549394d6c..549394d6c 100644
--- a/src/zonemaster/zonemaster.conf.in
+++ b/src/service/zonemaster/zonemaster.conf.in