53 files changed, 31 insertions, 31 deletions

diff --git a/configure.ac b/configure.ac
index 98ae7939c..bb3868651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1253,6 +1253,8 @@ src/service/datastore/Makefile
 src/service/datastore/datastore.conf
 src/service/dht/Makefile
 src/service/dht/dht.conf
+src/service/dns/Makefile
+src/service/dns/dns.conf
 src/service/hostlist/Makefile
 src/service/identity/Makefile
 src/service/identity/identity.conf
@@ -1264,6 +1266,8 @@ src/service/nse/Makefile
 src/service/nse/nse.conf
 src/service/peerstore/Makefile
 src/service/peerstore/peerstore.conf
+src/service/regex/Makefile
+src/service/regex/regex.conf
 src/service/rest/Makefile
 src/service/statistics/Makefile
 src/service/statistics/statistics.conf
@@ -1299,8 +1303,6 @@ src/consensus/Makefile
 src/consensus/consensus.conf
 src/conversation/Makefile
 src/conversation/conversation.conf
-src/dns/Makefile
-src/dns/dns.conf
 src/exit/Makefile
 src/fs/Makefile
 src/fs/fs.conf
@@ -1315,8 +1317,6 @@ src/namecache/namecache.conf
 src/namestore/Makefile
 src/namestore/namestore.conf
 src/pt/Makefile
-src/regex/Makefile
-src/regex/regex.conf
 src/revocation/Makefile
 src/revocation/revocation.conf
 src/secretsharing/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 474504fc0..9086d5edc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,13 +62,6 @@ src/conversation/gnunet_gst_test.c
 src/conversation/microphone.c
 src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
-src/dns/dns_api.c
-src/dns/gnunet-dns-monitor.c
-src/dns/gnunet-dns-redirector.c
-src/dns/gnunet-helper-dns.c
-src/dns/gnunet-service-dns.c
-src/dns/gnunet-zonewalk.c
-src/dns/plugin_block_dns.c
 src/exit/gnunet-daemon-exit.c
 src/exit/gnunet-helper-exit.c
 src/fs/fs_api.c
@@ -307,20 +300,6 @@ src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/reclaim/reclaim_attribute.c
 src/reclaim/reclaim_credential.c
-src/regex/gnunet-daemon-regexprofiler.c
-src/regex/gnunet-regex-profiler.c
-src/regex/gnunet-regex-simulation-profiler.c
-src/regex/gnunet-service-regex.c
-src/regex/perf-regex.c
-src/regex/plugin_block_regex.c
-src/regex/regex_api_announce.c
-src/regex/regex_api_search.c
-src/regex/regex_block_lib.c
-src/regex/regex_internal.c
-src/regex/regex_internal_dht.c
-src/regex/regex_test_graph.c
-src/regex/regex_test_lib.c
-src/regex/regex_test_random.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
@@ -388,6 +367,13 @@ src/service/dht/gnunet-service-dht_neighbours.c
 src/service/dht/gnunet-service-dht_routing.c
 src/service/dht/gnunet_dht_profiler.c
 src/service/dht/plugin_block_dht.c
+src/service/dns/dns_api.c
+src/service/dns/gnunet-dns-monitor.c
+src/service/dns/gnunet-dns-redirector.c
+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/hostlist/gnunet-daemon-hostlist.c
 src/service/hostlist/gnunet-daemon-hostlist_client.c
 src/service/hostlist/gnunet-daemon-hostlist_server.c
@@ -418,6 +404,20 @@ src/service/peerstore/peerstore_api.c
 src/service/peerstore/peerstore_common.c
 src/service/peerstore/plugin_peerstore_flat.c
 src/service/peerstore/plugin_peerstore_sqlite.c
+src/service/regex/gnunet-daemon-regexprofiler.c
+src/service/regex/gnunet-regex-profiler.c
+src/service/regex/gnunet-regex-simulation-profiler.c
+src/service/regex/gnunet-service-regex.c
+src/service/regex/perf-regex.c
+src/service/regex/plugin_block_regex.c
+src/service/regex/regex_api_announce.c
+src/service/regex/regex_api_search.c
+src/service/regex/regex_block_lib.c
+src/service/regex/regex_internal.c
+src/service/regex/regex_internal_dht.c
+src/service/regex/regex_test_graph.c
+src/service/regex/regex_test_lib.c
+src/service/regex/regex_test_random.c
 src/service/rest/gnunet-rest-server.c
 src/service/rest/rest.c
 src/service/statistics/gnunet-service-statistics.c
diff --git a/src/Makefile.am b/src/Makefile.am
index da3cd2d5f..16eafc57b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  regex \
-  dns \
   namecache \
   namestore \
   set \
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index 65ea493dc..524fe19fa 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -34,5 +34,5 @@ gnunet_daemon_exit_LDADD = \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+  $(top_builddir)/src/service/regex/libgnunetregex.la \
   $(GN_LIBINTL)
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index c42e5e6d4..4a84f914f 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -203,7 +203,7 @@ gnunet_service_gns_LDADD = \
   $(top_builddir)/src/revocation/libgnunetrevocation.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  $(top_builddir)/src/service/dns/libgnunetdns.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   $(LIBIDN) $(LIBIDN2) \
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 659ede7f8..567cbb6d7 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -23,7 +23,7 @@ gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/vpn/libgnunetvpn.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  $(top_builddir)/src/service/dns/libgnunetdns.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL)
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 6b4fa3264..45b24a4a2 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -11,9 +11,11 @@ SUBDIRS = \
         nse \
   hostlist \
   topology \
+  dns \
         identity \
         rest \
         datacache \
         datastore \
         dht \
+  regex \
         cadet
diff --git a/src/dns/.gitignore b/src/service/dns/.gitignore
index d3a62470e..d3a62470e 100644
--- a/src/dns/.gitignore
+++ b/src/service/dns/.gitignore
diff --git a/src/dns/Makefile.am b/src/service/dns/Makefile.am
index 38ee78c3a..38ee78c3a 100644
--- a/src/dns/Makefile.am
+++ b/src/service/dns/Makefile.am
diff --git a/src/dns/dns.conf.in b/src/service/dns/dns.conf.in
index 39f260813..39f260813 100644
--- a/src/dns/dns.conf.in
+++ b/src/service/dns/dns.conf.in
diff --git a/src/dns/dns.h b/src/service/dns/dns.h
index 515012079..515012079 100644
--- a/src/dns/dns.h
+++ b/src/service/dns/dns.h
diff --git a/src/dns/dns_api.c b/src/service/dns/dns_api.c
index b0bbb894f..b0bbb894f 100644
--- a/src/dns/dns_api.c
+++ b/src/service/dns/dns_api.c
diff --git a/src/dns/gnunet-dns-monitor.c b/src/service/dns/gnunet-dns-monitor.c
index c1ef17255..c1ef17255 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/service/dns/gnunet-dns-monitor.c
diff --git a/src/dns/gnunet-dns-redirector.c b/src/service/dns/gnunet-dns-redirector.c
index 045207f8c..045207f8c 100644
--- a/src/dns/gnunet-dns-redirector.c
+++ b/src/service/dns/gnunet-dns-redirector.c
diff --git a/src/dns/gnunet-helper-dns.c b/src/service/dns/gnunet-helper-dns.c
index 54443cd7a..54443cd7a 100644
--- a/src/dns/gnunet-helper-dns.c
+++ b/src/service/dns/gnunet-helper-dns.c
diff --git a/src/dns/gnunet-service-dns.c b/src/service/dns/gnunet-service-dns.c
index 24566ae21..24566ae21 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/service/dns/gnunet-service-dns.c
diff --git a/src/dns/gnunet-zonewalk.c b/src/service/dns/gnunet-zonewalk.c
index 0526df698..0526df698 100644
--- a/src/dns/gnunet-zonewalk.c
+++ b/src/service/dns/gnunet-zonewalk.c
diff --git a/src/dns/meson.build b/src/service/dns/meson.build
index e1ac0bf29..e1ac0bf29 100644
--- a/src/dns/meson.build
+++ b/src/service/dns/meson.build
diff --git a/src/dns/plugin_block_dns.c b/src/service/dns/plugin_block_dns.c
index 1bbd7f750..1bbd7f750 100644
--- a/src/dns/plugin_block_dns.c
+++ b/src/service/dns/plugin_block_dns.c
diff --git a/src/dns/test_gnunet_dns.sh b/src/service/dns/test_gnunet_dns.sh
index e0fcb711d..e0fcb711d 100755
--- a/src/dns/test_gnunet_dns.sh
+++ b/src/service/dns/test_gnunet_dns.sh
diff --git a/src/regex/.gitignore b/src/service/regex/.gitignore
index 39dc89c88..39dc89c88 100644
--- a/src/regex/.gitignore
+++ b/src/service/regex/.gitignore
diff --git a/src/regex/Makefile.am b/src/service/regex/Makefile.am
index 14cdb054b..14cdb054b 100644
--- a/src/regex/Makefile.am
+++ b/src/service/regex/Makefile.am
diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/service/regex/gnunet-daemon-regexprofiler.c
index 70301338f..70301338f 100644
--- a/src/regex/gnunet-daemon-regexprofiler.c
+++ b/src/service/regex/gnunet-daemon-regexprofiler.c
diff --git a/src/regex/gnunet-regex-profiler.c b/src/service/regex/gnunet-regex-profiler.c
index 8238ad3df..8238ad3df 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/service/regex/gnunet-regex-profiler.c
diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/service/regex/gnunet-regex-simulation-profiler.c
index abdb1abeb..abdb1abeb 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/service/regex/gnunet-regex-simulation-profiler.c
diff --git a/src/regex/gnunet-service-regex.c b/src/service/regex/gnunet-service-regex.c
index c25ef9eda..c25ef9eda 100644
--- a/src/regex/gnunet-service-regex.c
+++ b/src/service/regex/gnunet-service-regex.c
diff --git a/src/regex/meson.build b/src/service/regex/meson.build
index 24bc8e31e..24bc8e31e 100644
--- a/src/regex/meson.build
+++ b/src/service/regex/meson.build
diff --git a/src/regex/perf-data.tar.gz b/src/service/regex/perf-data.tar.gz
index 9e909e58e..9e909e58e 100644
--- a/src/regex/perf-data.tar.gz
+++ b/src/service/regex/perf-data.tar.gz
diff --git a/src/regex/perf-regex.c b/src/service/regex/perf-regex.c
index fbddc58eb..fbddc58eb 100644
--- a/src/regex/perf-regex.c
+++ b/src/service/regex/perf-regex.c
diff --git a/src/regex/plugin_block_regex.c b/src/service/regex/plugin_block_regex.c
index 5f23a32df..5f23a32df 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/service/regex/plugin_block_regex.c
diff --git a/src/regex/regex.conf.in b/src/service/regex/regex.conf.in
index 5e68a43da..5e68a43da 100644
--- a/src/regex/regex.conf.in
+++ b/src/service/regex/regex.conf.in
diff --git a/src/regex/regex_api_announce.c b/src/service/regex/regex_api_announce.c
index 12f173476..12f173476 100644
--- a/src/regex/regex_api_announce.c
+++ b/src/service/regex/regex_api_announce.c
diff --git a/src/regex/regex_api_search.c b/src/service/regex/regex_api_search.c
index 71219cbdd..71219cbdd 100644
--- a/src/regex/regex_api_search.c
+++ b/src/service/regex/regex_api_search.c
diff --git a/src/regex/regex_block_lib.c b/src/service/regex/regex_block_lib.c
index 048d6d743..048d6d743 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/service/regex/regex_block_lib.c
diff --git a/src/regex/regex_block_lib.h b/src/service/regex/regex_block_lib.h
index 11029b9af..11029b9af 100644
--- a/src/regex/regex_block_lib.h
+++ b/src/service/regex/regex_block_lib.h
diff --git a/src/regex/regex_internal.c b/src/service/regex/regex_internal.c
index c4fab6b56..c4fab6b56 100644
--- a/src/regex/regex_internal.c
+++ b/src/service/regex/regex_internal.c
diff --git a/src/regex/regex_internal.h b/src/service/regex/regex_internal.h
index 8d4526d1f..8d4526d1f 100644
--- a/src/regex/regex_internal.h
+++ b/src/service/regex/regex_internal.h
diff --git a/src/regex/regex_internal_dht.c b/src/service/regex/regex_internal_dht.c
index bda979edb..bda979edb 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/service/regex/regex_internal_dht.c
diff --git a/src/regex/regex_internal_lib.h b/src/service/regex/regex_internal_lib.h
index 9baf84995..9baf84995 100644
--- a/src/regex/regex_internal_lib.h
+++ b/src/service/regex/regex_internal_lib.h
diff --git a/src/regex/regex_ipc.h b/src/service/regex/regex_ipc.h
index b5a474d56..b5a474d56 100644
--- a/src/regex/regex_ipc.h
+++ b/src/service/regex/regex_ipc.h
diff --git a/src/regex/regex_simulation_profiler_test.conf b/src/service/regex/regex_simulation_profiler_test.conf
index 9384aa249..9384aa249 100644
--- a/src/regex/regex_simulation_profiler_test.conf
+++ b/src/service/regex/regex_simulation_profiler_test.conf
diff --git a/src/regex/regex_test_graph.c b/src/service/regex/regex_test_graph.c
index c8efae772..c8efae772 100644
--- a/src/regex/regex_test_graph.c
+++ b/src/service/regex/regex_test_graph.c
diff --git a/src/regex/regex_test_lib.c b/src/service/regex/regex_test_lib.c
index 2fece6bff..2fece6bff 100644
--- a/src/regex/regex_test_lib.c
+++ b/src/service/regex/regex_test_lib.c
diff --git a/src/regex/regex_test_lib.h b/src/service/regex/regex_test_lib.h
index 98f60d317..98f60d317 100644
--- a/src/regex/regex_test_lib.h
+++ b/src/service/regex/regex_test_lib.h
diff --git a/src/regex/regex_test_random.c b/src/service/regex/regex_test_random.c
index 56508b3b4..56508b3b4 100644
--- a/src/regex/regex_test_random.c
+++ b/src/service/regex/regex_test_random.c
diff --git a/src/regex/test_regex_api.c b/src/service/regex/test_regex_api.c
index 9761e80f9..9761e80f9 100644
--- a/src/regex/test_regex_api.c
+++ b/src/service/regex/test_regex_api.c
diff --git a/src/regex/test_regex_api_data.conf b/src/service/regex/test_regex_api_data.conf
index 40fee1e54..40fee1e54 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/service/regex/test_regex_api_data.conf
diff --git a/src/regex/test_regex_eval_api.c b/src/service/regex/test_regex_eval_api.c
index 475bfb7c8..475bfb7c8 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/service/regex/test_regex_eval_api.c
diff --git a/src/regex/test_regex_graph_api.c b/src/service/regex/test_regex_graph_api.c
index 5c12ea229..5c12ea229 100644
--- a/src/regex/test_regex_graph_api.c
+++ b/src/service/regex/test_regex_graph_api.c
diff --git a/src/regex/test_regex_integration.c b/src/service/regex/test_regex_integration.c
index 1f422e5a3..1f422e5a3 100644
--- a/src/regex/test_regex_integration.c
+++ b/src/service/regex/test_regex_integration.c
diff --git a/src/regex/test_regex_iterate_api.c b/src/service/regex/test_regex_iterate_api.c
index 4fb4f7817..4fb4f7817 100644
--- a/src/regex/test_regex_iterate_api.c
+++ b/src/service/regex/test_regex_iterate_api.c
diff --git a/src/regex/test_regex_proofs.c b/src/service/regex/test_regex_proofs.c
index 289b1183b..289b1183b 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/service/regex/test_regex_proofs.c
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 2f465731c..6fc1bff20 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -42,7 +42,7 @@ gnunet_service_vpn_LDADD = \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+  $(top_builddir)/src/service/regex/libgnunetregex.la \
   $(GN_LIBINTL)
 gnunet_service_vpn_CFLAGS = \
   -I$(top_srcdir)/src/exit $(CFLAGS)