[gnunet] branch master updated (773211a4d -> 54a37c423)

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (773211a4d -> 54a37c423)

From:	gnunet
Subject:	[gnunet] branch master updated (773211a4d -> 54a37c423)
Date:	Thu, 19 Oct 2023 09:17:08 +0200
This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 773211a4d -remove hello folder again
     new 210da3752 BUILD: Move template to service/cli
     new bd941ca1b fot got to add file
     new 9c198a005 BUILD: Move nat-auto to service/cli
     new 5ae8ee063 BUILD: Move topology to service
     new 7f72b0524 BUILD: Move regex/dns to service
     new 54a37c423 BUILD: Move namecache to service

The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                                       |  26 ++++---
 po/POTFILES.in                                     |  81 ++++++++++-----------
 src/Makefile.am                                    |   7 --
 src/cli/Makefile.am                                |   2 +
 src/cli/namecache/.gitignore                       |   1 +
 src/cli/namecache/Makefile.am                      |  20 +++++
 src/{ => cli}/namecache/gnunet-namecache.c         |   0
 src/{ => cli}/nat-auto/.gitignore                  |   1 -
 src/cli/nat-auto/Makefile.am                       |  26 +++++++
 src/{ => cli}/nat-auto/gnunet-nat-auto.c           |   0
 src/{ => cli}/nat-auto/gnunet-nat-server.c         |   3 +-
 src/cli/nat/Makefile.am                            |   2 +-
 src/{cli/nse => contrib/cli/template}/Makefile.am  |  21 +++---
 src/{ => contrib/cli}/template/gnunet-template.c   |   0
 src/contrib/service/Makefile.am                    |   1 +
 src/{ => contrib/service}/template/.gitignore      |   0
 src/{ => contrib/service}/template/Makefile.am     |   7 --
 .../service}/template/gnunet-service-template.c    |   0
 src/{ => contrib/service}/template/meson.build     |   0
 src/{ => contrib/service}/template/template.conf   |   0
 .../service}/template/test_template_api.c          |   0
 src/exit/Makefile.am                               |   2 +-
 src/gns/Makefile.am                                |   4 +-
 src/namestore/Makefile.am                          |  10 +--
 src/plugin/Makefile.am                             |   3 +-
 src/{ => plugin}/namecache/Makefile.am             |  64 +---------------
 src/{ => plugin}/namecache/namecache-0001.sql      |   0
 src/{ => plugin}/namecache/namecache-drop.sql      |   0
 src/{ => plugin}/namecache/plugin_namecache_flat.c |   1 -
 .../namecache/plugin_namecache_postgres.c          |   1 -
 .../namecache/plugin_namecache_sqlite.c            |   1 -
 src/pt/Makefile.am                                 |   2 +-
 src/service/Makefile.am                            |   6 ++
 src/{ => service}/dns/.gitignore                   |   0
 src/{ => service}/dns/Makefile.am                  |   0
 src/{ => service}/dns/dns.conf.in                  |   0
 src/{ => service}/dns/dns.h                        |   0
 src/{ => service}/dns/dns_api.c                    |   0
 src/{ => service}/dns/gnunet-dns-monitor.c         |   0
 src/{ => service}/dns/gnunet-dns-redirector.c      |   0
 src/{ => service}/dns/gnunet-helper-dns.c          |   0
 src/{ => service}/dns/gnunet-service-dns.c         |   0
 src/{ => service}/dns/gnunet-zonewalk.c            |   0
 src/{ => service}/dns/meson.build                  |   0
 src/{ => service}/dns/plugin_block_dns.c           |   0
 src/{ => service}/dns/test_gnunet_dns.sh           |   0
 src/{ => service}/hostlist/.gitignore              |   0
 src/{ => service}/hostlist/Makefile.am             |   0
 .../hostlist/gnunet-daemon-hostlist.c              |   0
 .../hostlist/gnunet-daemon-hostlist.h              |   0
 .../hostlist/gnunet-daemon-hostlist_client.c       |   0
 .../hostlist/gnunet-daemon-hostlist_client.h       |   0
 .../hostlist/gnunet-daemon-hostlist_server.c       |   0
 .../hostlist/gnunet-daemon-hostlist_server.h       |   0
 src/{ => service}/hostlist/hostlist.conf           |   0
 .../hostlist/hostlists_learn_peer2.file            | Bin
 src/{ => service}/hostlist/learning_data.conf      |   0
 src/{ => service}/hostlist/meson.build             |   0
 .../hostlist/test_gnunet_daemon_hostlist.c         |   0
 .../hostlist/test_gnunet_daemon_hostlist_data.conf |   0
 .../test_gnunet_daemon_hostlist_learning.c         |   0
 .../test_gnunet_daemon_hostlist_peer1.conf         |   0
 .../test_gnunet_daemon_hostlist_peer2.conf         |   0
 .../test_gnunet_daemon_hostlist_reconnect.c        |   0
 .../hostlist/test_hostlist_defaults.conf           |   0
 .../hostlist/test_learning_adv_peer.conf           |   0
 .../hostlist/test_learning_learn_peer.conf         |   0
 .../hostlist/test_learning_learn_peer2.conf        |   0
 src/{ => service}/namecache/.gitignore             |   1 -
 src/service/namecache/Makefile.am                  |  76 +++++++++++++++++++
 .../namecache/gnunet-service-namecache.c           |   0
 src/{ => service}/namecache/meson.build            |   0
 src/{ => service}/namecache/namecache.conf.in      |   0
 src/{ => service}/namecache/namecache.h            |   0
 src/{ => service}/namecache/namecache_api.c        |   0
 .../namecache/test_namecache_api.conf              |   0
 .../namecache/test_namecache_api_cache_block.c     |   0
 .../namecache/test_plugin_namecache.c              |   0
 .../namecache/test_plugin_namecache_flat.conf      |   0
 .../namecache/test_plugin_namecache_postgres.conf  |   0
 .../namecache/test_plugin_namecache_sqlite.conf    |   0
 src/service/nat-auto/.gitignore                    |   2 +
 src/{ => service}/nat-auto/Makefile.am             |  20 -----
 .../nat-auto/gnunet-nat-auto_legacy.c              |   0
 .../nat-auto/gnunet-service-nat-auto.c             |   0
 .../nat-auto/gnunet-service-nat-auto_legacy.c      |   0
 src/{ => service}/nat-auto/meson.build             |   0
 src/{ => service}/nat-auto/nat-auto.conf.in        |   0
 src/{ => service}/nat-auto/nat-auto.h              |   0
 src/{ => service}/nat-auto/nat_auto_api.c          |   0
 src/{ => service}/nat-auto/nat_auto_api_test.c     |   0
 src/{ => service}/regex/.gitignore                 |   0
 src/{ => service}/regex/Makefile.am                |   0
 .../regex/gnunet-daemon-regexprofiler.c            |   0
 src/{ => service}/regex/gnunet-regex-profiler.c    |   0
 .../regex/gnunet-regex-simulation-profiler.c       |   0
 src/{ => service}/regex/gnunet-service-regex.c     |   0
 src/{ => service}/regex/meson.build                |   0
 src/{ => service}/regex/perf-data.tar.gz           | Bin
 src/{ => service}/regex/perf-regex.c               |   0
 src/{ => service}/regex/plugin_block_regex.c       |   0
 src/{ => service}/regex/regex.conf.in              |   0
 src/{ => service}/regex/regex_api_announce.c       |   0
 src/{ => service}/regex/regex_api_search.c         |   0
 src/{ => service}/regex/regex_block_lib.c          |   0
 src/{ => service}/regex/regex_block_lib.h          |   0
 src/{ => service}/regex/regex_internal.c           |   0
 src/{ => service}/regex/regex_internal.h           |   0
 src/{ => service}/regex/regex_internal_dht.c       |   0
 src/{ => service}/regex/regex_internal_lib.h       |   0
 src/{ => service}/regex/regex_ipc.h                |   0
 .../regex/regex_simulation_profiler_test.conf      |   0
 src/{ => service}/regex/regex_test_graph.c         |   0
 src/{ => service}/regex/regex_test_lib.c           |   0
 src/{ => service}/regex/regex_test_lib.h           |   0
 src/{ => service}/regex/regex_test_random.c        |   0
 src/{ => service}/regex/test_regex_api.c           |   0
 src/{ => service}/regex/test_regex_api_data.conf   |   0
 src/{ => service}/regex/test_regex_eval_api.c      |   0
 src/{ => service}/regex/test_regex_graph_api.c     |   0
 src/{ => service}/regex/test_regex_integration.c   |   0
 src/{ => service}/regex/test_regex_iterate_api.c   |   0
 src/{ => service}/regex/test_regex_proofs.c        |   0
 src/{ => service}/topology/.gitignore              |   0
 src/{ => service}/topology/Makefile.am             |   0
 .../topology/gnunet-daemon-topology.c              |   0
 src/{ => service}/topology/meson.build             |   0
 .../topology/test_gnunet_daemon_topology.c         |   0
 .../topology/test_gnunet_daemon_topology_data.conf |   0
 src/{ => service}/topology/topology.conf           |   0
 src/vpn/Makefile.am                                |   2 +-
 src/zonemaster/Makefile.am                         |   2 +-
 132 files changed, 219 insertions(+), 176 deletions(-)
 create mode 100644 src/cli/namecache/.gitignore
 create mode 100644 src/cli/namecache/Makefile.am
 rename src/{ => cli}/namecache/gnunet-namecache.c (100%)
 rename src/{ => cli}/nat-auto/.gitignore (58%)
 create mode 100644 src/cli/nat-auto/Makefile.am
 rename src/{ => cli}/nat-auto/gnunet-nat-auto.c (100%)
 rename src/{ => cli}/nat-auto/gnunet-nat-server.c (99%)
 copy src/{cli/nse => contrib/cli/template}/Makefile.am (53%)
 rename src/{ => contrib/cli}/template/gnunet-template.c (100%)
 rename src/{ => contrib/service}/template/.gitignore (100%)
 rename src/{ => contrib/service}/template/Makefile.am (86%)
 rename src/{ => contrib/service}/template/gnunet-service-template.c (100%)
 rename src/{ => contrib/service}/template/meson.build (100%)
 rename src/{ => contrib/service}/template/template.conf (100%)
 rename src/{ => contrib/service}/template/test_template_api.c (100%)
 rename src/{ => plugin}/namecache/Makefile.am (67%)
 rename src/{ => plugin}/namecache/namecache-0001.sql (100%)
 rename src/{ => plugin}/namecache/namecache-drop.sql (100%)
 rename src/{ => plugin}/namecache/plugin_namecache_flat.c (99%)
 rename src/{ => plugin}/namecache/plugin_namecache_postgres.c (99%)
 rename src/{ => plugin}/namecache/plugin_namecache_sqlite.c (99%)
 rename src/{ => service}/dns/.gitignore (100%)
 rename src/{ => service}/dns/Makefile.am (100%)
 rename src/{ => service}/dns/dns.conf.in (100%)
 rename src/{ => service}/dns/dns.h (100%)
 rename src/{ => service}/dns/dns_api.c (100%)
 rename src/{ => service}/dns/gnunet-dns-monitor.c (100%)
 rename src/{ => service}/dns/gnunet-dns-redirector.c (100%)
 rename src/{ => service}/dns/gnunet-helper-dns.c (100%)
 rename src/{ => service}/dns/gnunet-service-dns.c (100%)
 rename src/{ => service}/dns/gnunet-zonewalk.c (100%)
 rename src/{ => service}/dns/meson.build (100%)
 rename src/{ => service}/dns/plugin_block_dns.c (100%)
 rename src/{ => service}/dns/test_gnunet_dns.sh (100%)
 rename src/{ => service}/hostlist/.gitignore (100%)
 rename src/{ => service}/hostlist/Makefile.am (100%)
 rename src/{ => service}/hostlist/gnunet-daemon-hostlist.c (100%)
 rename src/{ => service}/hostlist/gnunet-daemon-hostlist.h (100%)
 rename src/{ => service}/hostlist/gnunet-daemon-hostlist_client.c (100%)
 rename src/{ => service}/hostlist/gnunet-daemon-hostlist_client.h (100%)
 rename src/{ => service}/hostlist/gnunet-daemon-hostlist_server.c (100%)
 rename src/{ => service}/hostlist/gnunet-daemon-hostlist_server.h (100%)
 rename src/{ => service}/hostlist/hostlist.conf (100%)
 rename src/{ => service}/hostlist/hostlists_learn_peer2.file (100%)
 rename src/{ => service}/hostlist/learning_data.conf (100%)
 rename src/{ => service}/hostlist/meson.build (100%)
 rename src/{ => service}/hostlist/test_gnunet_daemon_hostlist.c (100%)
 rename src/{ => service}/hostlist/test_gnunet_daemon_hostlist_data.conf (100%)
 rename src/{ => service}/hostlist/test_gnunet_daemon_hostlist_learning.c (100%)
 rename src/{ => service}/hostlist/test_gnunet_daemon_hostlist_peer1.conf (100%)
 rename src/{ => service}/hostlist/test_gnunet_daemon_hostlist_peer2.conf (100%)
 rename src/{ => service}/hostlist/test_gnunet_daemon_hostlist_reconnect.c 
(100%)
 rename src/{ => service}/hostlist/test_hostlist_defaults.conf (100%)
 rename src/{ => service}/hostlist/test_learning_adv_peer.conf (100%)
 rename src/{ => service}/hostlist/test_learning_learn_peer.conf (100%)
 rename src/{ => service}/hostlist/test_learning_learn_peer2.conf (100%)
 rename src/{ => service}/namecache/.gitignore (90%)
 create mode 100644 src/service/namecache/Makefile.am
 rename src/{ => service}/namecache/gnunet-service-namecache.c (100%)
 rename src/{ => service}/namecache/meson.build (100%)
 rename src/{ => service}/namecache/namecache.conf.in (100%)
 rename src/{ => service}/namecache/namecache.h (100%)
 rename src/{ => service}/namecache/namecache_api.c (100%)
 rename src/{ => service}/namecache/test_namecache_api.conf (100%)
 rename src/{ => service}/namecache/test_namecache_api_cache_block.c (100%)
 rename src/{ => service}/namecache/test_plugin_namecache.c (100%)
 rename src/{ => service}/namecache/test_plugin_namecache_flat.conf (100%)
 rename src/{ => service}/namecache/test_plugin_namecache_postgres.conf (100%)
 rename src/{ => service}/namecache/test_plugin_namecache_sqlite.conf (100%)
 create mode 100644 src/service/nat-auto/.gitignore
 rename src/{ => service}/nat-auto/Makefile.am (66%)
 rename src/{ => service}/nat-auto/gnunet-nat-auto_legacy.c (100%)
 rename src/{ => service}/nat-auto/gnunet-service-nat-auto.c (100%)
 rename src/{ => service}/nat-auto/gnunet-service-nat-auto_legacy.c (100%)
 rename src/{ => service}/nat-auto/meson.build (100%)
 rename src/{ => service}/nat-auto/nat-auto.conf.in (100%)
 rename src/{ => service}/nat-auto/nat-auto.h (100%)
 rename src/{ => service}/nat-auto/nat_auto_api.c (100%)
 rename src/{ => service}/nat-auto/nat_auto_api_test.c (100%)
 rename src/{ => service}/regex/.gitignore (100%)
 rename src/{ => service}/regex/Makefile.am (100%)
 rename src/{ => service}/regex/gnunet-daemon-regexprofiler.c (100%)
 rename src/{ => service}/regex/gnunet-regex-profiler.c (100%)
 rename src/{ => service}/regex/gnunet-regex-simulation-profiler.c (100%)
 rename src/{ => service}/regex/gnunet-service-regex.c (100%)
 rename src/{ => service}/regex/meson.build (100%)
 rename src/{ => service}/regex/perf-data.tar.gz (100%)
 rename src/{ => service}/regex/perf-regex.c (100%)
 rename src/{ => service}/regex/plugin_block_regex.c (100%)
 rename src/{ => service}/regex/regex.conf.in (100%)
 rename src/{ => service}/regex/regex_api_announce.c (100%)
 rename src/{ => service}/regex/regex_api_search.c (100%)
 rename src/{ => service}/regex/regex_block_lib.c (100%)
 rename src/{ => service}/regex/regex_block_lib.h (100%)
 rename src/{ => service}/regex/regex_internal.c (100%)
 rename src/{ => service}/regex/regex_internal.h (100%)
 rename src/{ => service}/regex/regex_internal_dht.c (100%)
 rename src/{ => service}/regex/regex_internal_lib.h (100%)
 rename src/{ => service}/regex/regex_ipc.h (100%)
 rename src/{ => service}/regex/regex_simulation_profiler_test.conf (100%)
 rename src/{ => service}/regex/regex_test_graph.c (100%)
 rename src/{ => service}/regex/regex_test_lib.c (100%)
 rename src/{ => service}/regex/regex_test_lib.h (100%)
 rename src/{ => service}/regex/regex_test_random.c (100%)
 rename src/{ => service}/regex/test_regex_api.c (100%)
 rename src/{ => service}/regex/test_regex_api_data.conf (100%)
 rename src/{ => service}/regex/test_regex_eval_api.c (100%)
 rename src/{ => service}/regex/test_regex_graph_api.c (100%)
 rename src/{ => service}/regex/test_regex_integration.c (100%)
 rename src/{ => service}/regex/test_regex_iterate_api.c (100%)
 rename src/{ => service}/regex/test_regex_proofs.c (100%)
 rename src/{ => service}/topology/.gitignore (100%)
 rename src/{ => service}/topology/Makefile.am (100%)
 rename src/{ => service}/topology/gnunet-daemon-topology.c (100%)
 rename src/{ => service}/topology/meson.build (100%)
 rename src/{ => service}/topology/test_gnunet_daemon_topology.c (100%)
 rename src/{ => service}/topology/test_gnunet_daemon_topology_data.conf (100%)
 rename src/{ => service}/topology/topology.conf (100%)

diff --git a/configure.ac b/configure.ac
index cdcad80da..df0f29095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1241,6 +1241,7 @@ src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/dhtu/Makefile
 src/plugin/gnsrecord/Makefile
+src/plugin/namecache/Makefile
 src/service/Makefile
 src/service/arm/Makefile
 src/service/arm/arm.conf
@@ -1253,18 +1254,28 @@ 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
+src/service/namecache/Makefile
+src/service/namecache/namecache.conf
 src/service/nat/Makefile
 src/service/nat/nat.conf
+src/service/nat-auto/Makefile
+src/service/nat-auto/nat-auto.conf
 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
 src/service/testing/Makefile
+src/service/topology/Makefile
 src/service/transport/Makefile
 src/service/transport/transport.conf
 src/service/util/Makefile
@@ -1277,7 +1288,9 @@ src/cli/cadet/Makefile
 src/cli/core/Makefile
 src/cli/datastore/Makefile
 src/cli/dht/Makefile
+src/cli/namecache/Makefile
 src/cli/nat/Makefile
+src/cli/nat-auto/Makefile
 src/cli/nse/Makefile
 src/cli/statistics/Makefile
 src/cli/util/Makefile
@@ -1288,12 +1301,12 @@ src/contrib/service/abd/abd.conf
 src/contrib/service/auction/Makefile
 src/contrib/service/rps/Makefile
 src/contrib/service/rps/rps.conf
+src/contrib/service/template/Makefile
+src/contrib/cli/template/Makefile
 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
@@ -1303,16 +1316,9 @@ src/gns/nss/Makefile
 src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
-src/hostlist/Makefile
-src/namecache/Makefile
-src/namecache/namecache.conf
 src/namestore/Makefile
 src/namestore/namestore.conf
-src/nat-auto/Makefile
-src/nat-auto/nat-auto.conf
 src/pt/Makefile
-src/regex/Makefile
-src/regex/regex.conf
 src/revocation/Makefile
 src/revocation/revocation.conf
 src/secretsharing/Makefile
@@ -1325,8 +1331,6 @@ src/seti/Makefile
 src/seti/seti.conf
 src/setu/Makefile
 src/setu/setu.conf
-src/template/Makefile
-src/topology/Makefile
 src/vpn/Makefile
 src/vpn/vpn.conf
 src/zonemaster/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c4d20c4ba..d34922beb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,9 @@ src/cli/dht/gnunet-dht-hello.c
 src/cli/dht/gnunet-dht-monitor.c
 src/cli/dht/gnunet-dht-put.c
 src/cli/identity/gnunet-identity.c
+src/cli/namecache/gnunet-namecache.c
+src/cli/nat-auto/gnunet-nat-auto.c
+src/cli/nat-auto/gnunet-nat-server.c
 src/cli/nat/gnunet-nat.c
 src/cli/nse/gnunet-nse.c
 src/cli/statistics/gnunet-statistics.c
@@ -23,6 +26,7 @@ src/cli/util/gnunet-uri.c
 src/consensus/consensus_api.c
 src/consensus/gnunet-service-consensus.c
 src/consensus/plugin_block_consensus.c
+src/contrib/cli/template/gnunet-template.c
 src/contrib/service/abd/abd_api.c
 src/contrib/service/abd/abd_serialization.c
 src/contrib/service/abd/delegate_misc.c
@@ -44,6 +48,7 @@ src/contrib/service/rps/rps-sampler_client.c
 src/contrib/service/rps/rps-sampler_common.c
 src/contrib/service/rps/rps-test_util.c
 src/contrib/service/rps/rps_api.c
+src/contrib/service/template/gnunet-service-template.c
 src/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
 src/conversation/gnunet-conversation-test.c
@@ -58,13 +63,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
@@ -123,10 +121,6 @@ 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/hello/gnunet-hello.c
-src/hostlist/gnunet-daemon-hostlist.c
-src/hostlist/gnunet-daemon-hostlist_client.c
-src/hostlist/gnunet-daemon-hostlist_server.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
 src/lib/curl/curl.c
@@ -262,12 +256,6 @@ src/messenger/messenger_api_util.c
 src/messenger/plugin_gnsrecord_messenger.c
 src/messenger/testing_messenger_barrier.c
 src/messenger/testing_messenger_setup.c
-src/namecache/gnunet-namecache.c
-src/namecache/gnunet-service-namecache.c
-src/namecache/namecache_api.c
-src/namecache/plugin_namecache_flat.c
-src/namecache/plugin_namecache_postgres.c
-src/namecache/plugin_namecache_sqlite.c
 src/namestore/gnunet-namestore-dbtool.c
 src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-namestore-zonefile.c
@@ -280,19 +268,15 @@ src/namestore/plugin_namestore_flat.c
 src/namestore/plugin_namestore_postgres.c
 src/namestore/plugin_namestore_sqlite.c
 src/namestore/plugin_rest_namestore.c
-src/nat-auto/gnunet-nat-auto.c
-src/nat-auto/gnunet-nat-auto_legacy.c
-src/nat-auto/gnunet-nat-server.c
-src/nat-auto/gnunet-service-nat-auto.c
-src/nat-auto/gnunet-service-nat-auto_legacy.c
-src/nat-auto/nat_auto_api.c
-src/nat-auto/nat_auto_api_test.c
 src/plugin/block/plugin_block_template.c
 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/gnsrecord/plugin_gnsrecord_dns.c
+src/plugin/namecache/plugin_namecache_flat.c
+src/plugin/namecache/plugin_namecache_postgres.c
+src/plugin/namecache/plugin_namecache_sqlite.c
 src/pt/gnunet-daemon-pt.c
 src/reclaim/did_core.c
 src/reclaim/did_helper.c
@@ -314,20 +298,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
@@ -395,10 +365,27 @@ 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
 src/service/identity/gnunet-service-identity.c
 src/service/identity/identity_api.c
 src/service/identity/identity_api_lookup.c
 src/service/identity/identity_api_suffix_lookup.c
+src/service/namecache/gnunet-service-namecache.c
+src/service/namecache/namecache_api.c
+src/service/nat-auto/gnunet-nat-auto_legacy.c
+src/service/nat-auto/gnunet-service-nat-auto.c
+src/service/nat-auto/gnunet-service-nat-auto_legacy.c
+src/service/nat-auto/nat_auto_api.c
+src/service/nat-auto/nat_auto_api_test.c
 src/service/nat/gnunet-helper-nat-client.c
 src/service/nat/gnunet-helper-nat-server.c
 src/service/nat/gnunet-service-nat.c
@@ -417,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
@@ -443,6 +444,7 @@ src/service/testing/testing_api_cmd_system_create.c
 src/service/testing/testing_api_cmd_system_destroy.c
 src/service/testing/testing_api_loop.c
 src/service/testing/testing_api_traits.c
+src/service/topology/gnunet-daemon-topology.c
 src/service/transport/gnunet-communicator-quic.c
 src/service/transport/gnunet-communicator-tcp.c
 src/service/transport/gnunet-communicator-udp.c
@@ -489,8 +491,6 @@ src/setu/ibf.c
 src/setu/ibf_sim.c
 src/setu/plugin_block_setu_test.c
 src/setu/setu_api.c
-src/template/gnunet-service-template.c
-src/template/gnunet-template.c
 src/test/dhtu/testing_dhtu_cmd_send.c
 src/test/testing/gnunet-cmds-helper.c
 src/test/testing/gnunet-testing.c
@@ -514,7 +514,6 @@ src/test/testing/testing_api_cmd_system_create.c
 src/test/testing/testing_api_cmd_system_destroy.c
 src/test/testing/testing_api_loop.c
 src/test/testing/testing_api_traits.c
-src/topology/gnunet-daemon-topology.c
 src/vpn/gnunet-helper-vpn.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 1fc0748c7..d166fd788 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,13 +17,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  template \
-  nat-auto \
-  hostlist \
-  topology \
-  regex \
-  dns \
-  namecache \
   namestore \
   set \
   seti \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index cc716dda4..0235c0a1c 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -4,7 +4,9 @@ SUBDIRS = \
        statistics \
        core \
        nat \
+       nat-auto \
        nse \
        datastore \
        dht \
+       namecache \
        cadet
diff --git a/src/cli/namecache/.gitignore b/src/cli/namecache/.gitignore
new file mode 100644
index 000000000..54aa17e9f
--- /dev/null
+++ b/src/cli/namecache/.gitignore
@@ -0,0 +1 @@
+gnunet-namecache
diff --git a/src/cli/namecache/Makefile.am b/src/cli/namecache/Makefile.am
new file mode 100644
index 000000000..48ee216be
--- /dev/null
+++ b/src/cli/namecache/Makefile.am
@@ -0,0 +1,20 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-namecache
+
+gnunet_namecache_SOURCES = \
+ gnunet-namecache.c
+gnunet_namecache_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(GN_LIBINTL)
diff --git a/src/namecache/gnunet-namecache.c 
b/src/cli/namecache/gnunet-namecache.c
similarity index 100%
rename from src/namecache/gnunet-namecache.c
rename to src/cli/namecache/gnunet-namecache.c
diff --git a/src/nat-auto/.gitignore b/src/cli/nat-auto/.gitignore
similarity index 58%
rename from src/nat-auto/.gitignore
rename to src/cli/nat-auto/.gitignore
index 6ba53d72f..c750bf612 100644
--- a/src/nat-auto/.gitignore
+++ b/src/cli/nat-auto/.gitignore
@@ -1,3 +1,2 @@
-gnunet-service-nat-auto
 gnunet-nat-auto
 gnunet-nat-server
diff --git a/src/cli/nat-auto/Makefile.am b/src/cli/nat-auto/Makefile.am
new file mode 100644
index 000000000..4b2d74280
--- /dev/null
+++ b/src/cli/nat-auto/Makefile.am
@@ -0,0 +1,26 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+bin_PROGRAMS = \
+ gnunet-nat-auto \
+ gnunet-nat-server
+
+gnunet_nat_server_SOURCES = \
+ gnunet-nat-server.c
+gnunet_nat_server_LDADD = \
+  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_nat_server_LDFLAGS = \
+  $(GN_LIBINTL)
+
+gnunet_nat_auto_SOURCES = \
+  gnunet-nat-auto.c
+gnunet_nat_auto_LDADD = \
+  $(top_builddir)/src/service/nat-auto/libgnunetnatauto.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+gnunet_nat_auto_LDFLAGS = \
+  $(GN_LIBINTL)
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/cli/nat-auto/gnunet-nat-auto.c
similarity index 100%
rename from src/nat-auto/gnunet-nat-auto.c
rename to src/cli/nat-auto/gnunet-nat-auto.c
diff --git a/src/nat-auto/gnunet-nat-server.c 
b/src/cli/nat-auto/gnunet-nat-server.c
similarity index 99%
rename from src/nat-auto/gnunet-nat-server.c
rename to src/cli/nat-auto/gnunet-nat-server.c
index 0ff71ca8c..baa610e8f 100644
--- a/src/nat-auto/gnunet-nat-server.c
+++ b/src/cli/nat-auto/gnunet-nat-server.c
@@ -27,7 +27,8 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_service.h"
 #include "gnunet_protocols.h"
-#include "nat-auto.h"
+// FIXME can we build this without this header?
+#include "../../service/nat-auto/nat-auto.h"
 
 
 /**
diff --git a/src/cli/nat/Makefile.am b/src/cli/nat/Makefile.am
index 8c1a3109c..1bdd1a6be 100644
--- a/src/cli/nat/Makefile.am
+++ b/src/cli/nat/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = \
  gnunet-nat
 
 gnunet_nat_SOURCES = \
-  gnunet-nat.c nat.h
+  gnunet-nat.c
 gnunet_nat_LDADD = \
   $(top_builddir)/src/service/nat/libgnunetnatnew.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/cli/nse/Makefile.am b/src/contrib/cli/template/Makefile.am
similarity index 53%
copy from src/cli/nse/Makefile.am
copy to src/contrib/cli/template/Makefile.am
index e724a22d3..9f94d0837 100644
--- a/src/cli/nse/Makefile.am
+++ b/src/contrib/cli/template/Makefile.am
@@ -1,19 +1,20 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-bin_PROGRAMS = gnunet-nse
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+noinst_PROGRAMS = \
+ gnunet-template
+
 
-gnunet_nse_SOURCES = gnunet-nse.c
-gnunet_nse_LDADD = \
-  $(top_builddir)/src/service/nse/libgnunetnse.la \
+gnunet_service_template_SOURCES = \
+ gnunet-service-template.c
+gnunet_service_template_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIB) $(GN_LIBINTL)
+  $(GN_LIBINTL)
diff --git a/src/template/gnunet-template.c 
b/src/contrib/cli/template/gnunet-template.c
similarity index 100%
rename from src/template/gnunet-template.c
rename to src/contrib/cli/template/gnunet-template.c
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
index 25c3670d9..d7cb9946d 100644
--- a/src/contrib/service/Makefile.am
+++ b/src/contrib/service/Makefile.am
@@ -6,4 +6,5 @@ if HAVE_EXPERIMENTAL
 endif
 
 SUBDIRS = \
+       template \
        $(EXP_DIR)
diff --git a/src/template/.gitignore b/src/contrib/service/template/.gitignore
similarity index 100%
rename from src/template/.gitignore
rename to src/contrib/service/template/.gitignore
diff --git a/src/template/Makefile.am b/src/contrib/service/template/Makefile.am
similarity index 86%
rename from src/template/Makefile.am
rename to src/contrib/service/template/Makefile.am
index 8db34b330..4661266d7 100644
--- a/src/template/Makefile.am
+++ b/src/contrib/service/template/Makefile.am
@@ -17,16 +17,9 @@ endif
 # libexec_PROGRAMS should be used for gnunet-service-template
 
 noinst_PROGRAMS = \
- gnunet-template \
  gnunet-service-template
 
 
-gnunet_template_SOURCES = \
- gnunet-template.c
-gnunet_template_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 gnunet_service_template_SOURCES = \
  gnunet-service-template.c
 gnunet_service_template_LDADD = \
diff --git a/src/template/gnunet-service-template.c 
b/src/contrib/service/template/gnunet-service-template.c
similarity index 100%
rename from src/template/gnunet-service-template.c
rename to src/contrib/service/template/gnunet-service-template.c
diff --git a/src/template/meson.build b/src/contrib/service/template/meson.build
similarity index 100%
rename from src/template/meson.build
rename to src/contrib/service/template/meson.build
diff --git a/src/template/template.conf 
b/src/contrib/service/template/template.conf
similarity index 100%
rename from src/template/template.conf
rename to src/contrib/service/template/template.conf
diff --git a/src/template/test_template_api.c 
b/src/contrib/service/template/test_template_api.c
similarity index 100%
rename from src/template/test_template_api.c
rename to src/contrib/service/template/test_template_api.c
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..379d6697a 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -203,9 +203,9 @@ 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 \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(LIBIDN) $(LIBIDN2) \
   $(GN_LIBINTL)
 
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 3dbec4a25..685829cc2 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -186,7 +186,7 @@ gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 gnunet_service_namestore_SOURCES = \
  gnunet-service-namestore.c
 gnunet_service_namestore_LDADD = \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
@@ -245,7 +245,7 @@ test_namestore_api_store_update_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_store_update_postgres_SOURCES = \
@@ -255,7 +255,7 @@ test_namestore_api_store_update_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_sqlite_SOURCES = \
@@ -265,7 +265,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_postgres_SOURCES = \
@@ -275,7 +275,7 @@ test_namestore_api_lookup_nick_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   libgnunetnamestore.la
 
 test_namestore_api_remove_sqlite_SOURCES = \
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 891777369..2939d3379 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = \
        block \
        gnsrecord \
-       dhtu
+       dhtu \
+       namecache
diff --git a/src/namecache/Makefile.am b/src/plugin/namecache/Makefile.am
similarity index 67%
rename from src/namecache/Makefile.am
rename to src/plugin/namecache/Makefile.am
index 36e70813a..ac2e2592b 100644
--- a/src/namecache/Makefile.am
+++ b/src/plugin/namecache/Makefile.am
@@ -7,9 +7,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-pkgcfg_DATA = \
-   namecache.conf
-
 sqldir = $(prefix)/share/gnunet/sql/
 
 sql_DATA = \
@@ -55,50 +52,6 @@ TESTS = \
   $(check_PROGRAMS)
 endif
 
-lib_LTLIBRARIES = \
-  libgnunetnamecache.la
-
-
-libgnunetnamecache_la_SOURCES = \
-  namecache_api.c \
-  namecache.h
-libgnunetnamecache_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunetnamecache_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:0:0
-
-
-libexec_PROGRAMS = \
- gnunet-service-namecache
-
-bin_PROGRAMS = \
- gnunet-namecache
-
-gnunet_namecache_SOURCES = \
- gnunet-namecache.c
-gnunet_namecache_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamecache.la \
-  $(GN_LIBINTL)
-
-gnunet_service_namecache_SOURCES = \
- gnunet-service-namecache.c
-
-gnunet_service_namecache_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamecache.la \
-  $(GN_LIBINTL)
-
-
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
        $(FLAT_PLUGIN) \
@@ -107,7 +60,7 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_namecache_flat_la_SOURCES = \
   plugin_namecache_flat.c
 libgnunet_plugin_namecache_flat_la_LIBADD = \
-  libgnunetnamecache.la  \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
@@ -119,7 +72,7 @@ libgnunet_plugin_namecache_flat_la_LDFLAGS = \
 libgnunet_plugin_namecache_sqlite_la_SOURCES = \
   plugin_namecache_sqlite.c
 libgnunet_plugin_namecache_sqlite_la_LIBADD = \
-  libgnunetnamecache.la  \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/lib/sq/libgnunetsq.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -133,7 +86,7 @@ libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
 libgnunet_plugin_namecache_postgres_la_SOURCES = \
   plugin_namecache_postgres.c
 libgnunet_plugin_namecache_postgres_la_LIBADD = \
-  libgnunetnamecache.la  \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/lib/pq/libgnunetpq.la  \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
@@ -143,16 +96,6 @@ libgnunet_plugin_namecache_postgres_la_LIBADD = \
 libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
 
-test_namecache_api_cache_block_SOURCES = \
- test_namecache_api_cache_block.c
-test_namecache_api_cache_block_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamecache.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
 test_plugin_namecache_flat_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_flat_LDADD = \
@@ -172,7 +115,6 @@ test_plugin_namecache_postgres_LDADD = \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
-  test_namecache_api.conf \
   test_plugin_namecache_sqlite.conf \
   test_plugin_namecache_postgres.conf \
   test_plugin_namecache_flat.conf \
diff --git a/src/namecache/namecache-0001.sql 
b/src/plugin/namecache/namecache-0001.sql
similarity index 100%
rename from src/namecache/namecache-0001.sql
rename to src/plugin/namecache/namecache-0001.sql
diff --git a/src/namecache/namecache-drop.sql 
b/src/plugin/namecache/namecache-drop.sql
similarity index 100%
rename from src/namecache/namecache-drop.sql
rename to src/plugin/namecache/namecache-drop.sql
diff --git a/src/namecache/plugin_namecache_flat.c 
b/src/plugin/namecache/plugin_namecache_flat.c
similarity index 99%
rename from src/namecache/plugin_namecache_flat.c
rename to src/plugin/namecache/plugin_namecache_flat.c
index eb7800051..ba118bf02 100644
--- a/src/namecache/plugin_namecache_flat.c
+++ b/src/plugin/namecache/plugin_namecache_flat.c
@@ -28,7 +28,6 @@
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "namecache.h"
 
 /**
  * Context for all functions in this plugin.
diff --git a/src/namecache/plugin_namecache_postgres.c 
b/src/plugin/namecache/plugin_namecache_postgres.c
similarity index 99%
rename from src/namecache/plugin_namecache_postgres.c
rename to src/plugin/namecache/plugin_namecache_postgres.c
index cdbe248b6..7e2925d1a 100644
--- a/src/namecache/plugin_namecache_postgres.c
+++ b/src/plugin/namecache/plugin_namecache_postgres.c
@@ -28,7 +28,6 @@
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_pq_lib.h"
-#include "namecache.h"
 
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "namecache-postgres", 
__VA_ARGS__)
diff --git a/src/namecache/plugin_namecache_sqlite.c 
b/src/plugin/namecache/plugin_namecache_sqlite.c
similarity index 99%
rename from src/namecache/plugin_namecache_sqlite.c
rename to src/plugin/namecache/plugin_namecache_sqlite.c
index 2271d1db5..d8b485381 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/plugin/namecache/plugin_namecache_sqlite.c
@@ -28,7 +28,6 @@
 #include "gnunet_namecache_plugin.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "namecache.h"
 #include <sqlite3.h>
 
 /**
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 aa87eb34a..02148d0c7 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -5,12 +5,18 @@ SUBDIRS = \
        peerstore \
        testing \
        nat \
+       nat-auto \
        transport \
        core \
        nse \
+  hostlist \
+  topology \
+  dns \
        identity \
        rest \
        datacache \
        datastore \
        dht \
+  namecache \
+  regex \
        cadet
diff --git a/src/dns/.gitignore b/src/service/dns/.gitignore
similarity index 100%
rename from src/dns/.gitignore
rename to src/service/dns/.gitignore
diff --git a/src/dns/Makefile.am b/src/service/dns/Makefile.am
similarity index 100%
rename from src/dns/Makefile.am
rename to src/service/dns/Makefile.am
diff --git a/src/dns/dns.conf.in b/src/service/dns/dns.conf.in
similarity index 100%
rename from src/dns/dns.conf.in
rename to src/service/dns/dns.conf.in
diff --git a/src/dns/dns.h b/src/service/dns/dns.h
similarity index 100%
rename from src/dns/dns.h
rename to src/service/dns/dns.h
diff --git a/src/dns/dns_api.c b/src/service/dns/dns_api.c
similarity index 100%
rename from src/dns/dns_api.c
rename to src/service/dns/dns_api.c
diff --git a/src/dns/gnunet-dns-monitor.c b/src/service/dns/gnunet-dns-monitor.c
similarity index 100%
rename from src/dns/gnunet-dns-monitor.c
rename to src/service/dns/gnunet-dns-monitor.c
diff --git a/src/dns/gnunet-dns-redirector.c 
b/src/service/dns/gnunet-dns-redirector.c
similarity index 100%
rename from src/dns/gnunet-dns-redirector.c
rename to src/service/dns/gnunet-dns-redirector.c
diff --git a/src/dns/gnunet-helper-dns.c b/src/service/dns/gnunet-helper-dns.c
similarity index 100%
rename from src/dns/gnunet-helper-dns.c
rename to src/service/dns/gnunet-helper-dns.c
diff --git a/src/dns/gnunet-service-dns.c b/src/service/dns/gnunet-service-dns.c
similarity index 100%
rename from src/dns/gnunet-service-dns.c
rename to src/service/dns/gnunet-service-dns.c
diff --git a/src/dns/gnunet-zonewalk.c b/src/service/dns/gnunet-zonewalk.c
similarity index 100%
rename from src/dns/gnunet-zonewalk.c
rename to src/service/dns/gnunet-zonewalk.c
diff --git a/src/dns/meson.build b/src/service/dns/meson.build
similarity index 100%
rename from src/dns/meson.build
rename to src/service/dns/meson.build
diff --git a/src/dns/plugin_block_dns.c b/src/service/dns/plugin_block_dns.c
similarity index 100%
rename from src/dns/plugin_block_dns.c
rename to src/service/dns/plugin_block_dns.c
diff --git a/src/dns/test_gnunet_dns.sh b/src/service/dns/test_gnunet_dns.sh
similarity index 100%
rename from src/dns/test_gnunet_dns.sh
rename to src/service/dns/test_gnunet_dns.sh
diff --git a/src/hostlist/.gitignore b/src/service/hostlist/.gitignore
similarity index 100%
rename from src/hostlist/.gitignore
rename to src/service/hostlist/.gitignore
diff --git a/src/hostlist/Makefile.am b/src/service/hostlist/Makefile.am
similarity index 100%
rename from src/hostlist/Makefile.am
rename to src/service/hostlist/Makefile.am
diff --git a/src/hostlist/gnunet-daemon-hostlist.c 
b/src/service/hostlist/gnunet-daemon-hostlist.c
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist.c
rename to src/service/hostlist/gnunet-daemon-hostlist.c
diff --git a/src/hostlist/gnunet-daemon-hostlist.h 
b/src/service/hostlist/gnunet-daemon-hostlist.h
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist.h
rename to src/service/hostlist/gnunet-daemon-hostlist.h
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c 
b/src/service/hostlist/gnunet-daemon-hostlist_client.c
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_client.c
rename to src/service/hostlist/gnunet-daemon-hostlist_client.c
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h 
b/src/service/hostlist/gnunet-daemon-hostlist_client.h
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_client.h
rename to src/service/hostlist/gnunet-daemon-hostlist_client.h
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c 
b/src/service/hostlist/gnunet-daemon-hostlist_server.c
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_server.c
rename to src/service/hostlist/gnunet-daemon-hostlist_server.c
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h 
b/src/service/hostlist/gnunet-daemon-hostlist_server.h
similarity index 100%
rename from src/hostlist/gnunet-daemon-hostlist_server.h
rename to src/service/hostlist/gnunet-daemon-hostlist_server.h
diff --git a/src/hostlist/hostlist.conf b/src/service/hostlist/hostlist.conf
similarity index 100%
rename from src/hostlist/hostlist.conf
rename to src/service/hostlist/hostlist.conf
diff --git a/src/hostlist/hostlists_learn_peer2.file 
b/src/service/hostlist/hostlists_learn_peer2.file
similarity index 100%
rename from src/hostlist/hostlists_learn_peer2.file
rename to src/service/hostlist/hostlists_learn_peer2.file
diff --git a/src/hostlist/learning_data.conf 
b/src/service/hostlist/learning_data.conf
similarity index 100%
rename from src/hostlist/learning_data.conf
rename to src/service/hostlist/learning_data.conf
diff --git a/src/hostlist/meson.build b/src/service/hostlist/meson.build
similarity index 100%
rename from src/hostlist/meson.build
rename to src/service/hostlist/meson.build
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c 
b/src/service/hostlist/test_gnunet_daemon_hostlist.c
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist.c
rename to src/service/hostlist/test_gnunet_daemon_hostlist.c
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf 
b/src/service/hostlist/test_gnunet_daemon_hostlist_data.conf
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_data.conf
rename to src/service/hostlist/test_gnunet_daemon_hostlist_data.conf
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c 
b/src/service/hostlist/test_gnunet_daemon_hostlist_learning.c
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_learning.c
rename to src/service/hostlist/test_gnunet_daemon_hostlist_learning.c
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 
b/src/service/hostlist/test_gnunet_daemon_hostlist_peer1.conf
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
rename to src/service/hostlist/test_gnunet_daemon_hostlist_peer1.conf
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 
b/src/service/hostlist/test_gnunet_daemon_hostlist_peer2.conf
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
rename to src/service/hostlist/test_gnunet_daemon_hostlist_peer2.conf
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c 
b/src/service/hostlist/test_gnunet_daemon_hostlist_reconnect.c
similarity index 100%
rename from src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
rename to src/service/hostlist/test_gnunet_daemon_hostlist_reconnect.c
diff --git a/src/hostlist/test_hostlist_defaults.conf 
b/src/service/hostlist/test_hostlist_defaults.conf
similarity index 100%
rename from src/hostlist/test_hostlist_defaults.conf
rename to src/service/hostlist/test_hostlist_defaults.conf
diff --git a/src/hostlist/test_learning_adv_peer.conf 
b/src/service/hostlist/test_learning_adv_peer.conf
similarity index 100%
rename from src/hostlist/test_learning_adv_peer.conf
rename to src/service/hostlist/test_learning_adv_peer.conf
diff --git a/src/hostlist/test_learning_learn_peer.conf 
b/src/service/hostlist/test_learning_learn_peer.conf
similarity index 100%
rename from src/hostlist/test_learning_learn_peer.conf
rename to src/service/hostlist/test_learning_learn_peer.conf
diff --git a/src/hostlist/test_learning_learn_peer2.conf 
b/src/service/hostlist/test_learning_learn_peer2.conf
similarity index 100%
rename from src/hostlist/test_learning_learn_peer2.conf
rename to src/service/hostlist/test_learning_learn_peer2.conf
diff --git a/src/namecache/.gitignore b/src/service/namecache/.gitignore
similarity index 90%
rename from src/namecache/.gitignore
rename to src/service/namecache/.gitignore
index 2abc07dfb..280bf9f39 100644
--- a/src/namecache/.gitignore
+++ b/src/service/namecache/.gitignore
@@ -1,5 +1,4 @@
 gnunet-service-namecache
-gnunet-namecache
 test_namecache_api_cache_block
 test_plugin_namecache_postgres
 test_plugin_namecache_sqlite
diff --git a/src/service/namecache/Makefile.am 
b/src/service/namecache/Makefile.am
new file mode 100644
index 000000000..78e9eb48c
--- /dev/null
+++ b/src/service/namecache/Makefile.am
@@ -0,0 +1,76 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+   namecache.conf
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+# testcases do not even build yet; thus: experimental!
+TESTING_TESTS = \
+ test_namecache_api_cache_block
+
+if HAVE_SQLITE
+check_PROGRAMS = \
+ $(TESTING_TESTS)
+endif
+
+if ENABLE_TEST_RUN
+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_PROGRAMS)
+endif
+
+lib_LTLIBRARIES = \
+  libgnunetnamecache.la
+
+
+libgnunetnamecache_la_SOURCES = \
+  namecache_api.c \
+  namecache.h
+libgnunetnamecache_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+libgnunetnamecache_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  \
+  -version-info 0:0:0
+
+
+libexec_PROGRAMS = \
+ gnunet-service-namecache
+
+gnunet_service_namecache_SOURCES = \
+ gnunet-service-namecache.c
+
+gnunet_service_namecache_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  libgnunetnamecache.la \
+  $(GN_LIBINTL)
+
+
+test_namecache_api_cache_block_SOURCES = \
+ test_namecache_api_cache_block.c
+test_namecache_api_cache_block_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  libgnunetnamecache.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+
+EXTRA_DIST = \
+  test_namecache_api.conf
diff --git a/src/namecache/gnunet-service-namecache.c 
b/src/service/namecache/gnunet-service-namecache.c
similarity index 100%
rename from src/namecache/gnunet-service-namecache.c
rename to src/service/namecache/gnunet-service-namecache.c
diff --git a/src/namecache/meson.build b/src/service/namecache/meson.build
similarity index 100%
rename from src/namecache/meson.build
rename to src/service/namecache/meson.build
diff --git a/src/namecache/namecache.conf.in 
b/src/service/namecache/namecache.conf.in
similarity index 100%
rename from src/namecache/namecache.conf.in
rename to src/service/namecache/namecache.conf.in
diff --git a/src/namecache/namecache.h b/src/service/namecache/namecache.h
similarity index 100%
rename from src/namecache/namecache.h
rename to src/service/namecache/namecache.h
diff --git a/src/namecache/namecache_api.c 
b/src/service/namecache/namecache_api.c
similarity index 100%
rename from src/namecache/namecache_api.c
rename to src/service/namecache/namecache_api.c
diff --git a/src/namecache/test_namecache_api.conf 
b/src/service/namecache/test_namecache_api.conf
similarity index 100%
rename from src/namecache/test_namecache_api.conf
rename to src/service/namecache/test_namecache_api.conf
diff --git a/src/namecache/test_namecache_api_cache_block.c 
b/src/service/namecache/test_namecache_api_cache_block.c
similarity index 100%
rename from src/namecache/test_namecache_api_cache_block.c
rename to src/service/namecache/test_namecache_api_cache_block.c
diff --git a/src/namecache/test_plugin_namecache.c 
b/src/service/namecache/test_plugin_namecache.c
similarity index 100%
rename from src/namecache/test_plugin_namecache.c
rename to src/service/namecache/test_plugin_namecache.c
diff --git a/src/namecache/test_plugin_namecache_flat.conf 
b/src/service/namecache/test_plugin_namecache_flat.conf
similarity index 100%
rename from src/namecache/test_plugin_namecache_flat.conf
rename to src/service/namecache/test_plugin_namecache_flat.conf
diff --git a/src/namecache/test_plugin_namecache_postgres.conf 
b/src/service/namecache/test_plugin_namecache_postgres.conf
similarity index 100%
rename from src/namecache/test_plugin_namecache_postgres.conf
rename to src/service/namecache/test_plugin_namecache_postgres.conf
diff --git a/src/namecache/test_plugin_namecache_sqlite.conf 
b/src/service/namecache/test_plugin_namecache_sqlite.conf
similarity index 100%
rename from src/namecache/test_plugin_namecache_sqlite.conf
rename to src/service/namecache/test_plugin_namecache_sqlite.conf
diff --git a/src/service/nat-auto/.gitignore b/src/service/nat-auto/.gitignore
new file mode 100644
index 000000000..9bb5406ed
--- /dev/null
+++ b/src/service/nat-auto/.gitignore
@@ -0,0 +1,2 @@
+gnunet-service-nat-auto
+
diff --git a/src/nat-auto/Makefile.am b/src/service/nat-auto/Makefile.am
similarity index 66%
rename from src/nat-auto/Makefile.am
rename to src/service/nat-auto/Makefile.am
index 7c3f8e11d..a82afbea2 100644
--- a/src/nat-auto/Makefile.am
+++ b/src/service/nat-auto/Makefile.am
@@ -8,29 +8,9 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 pkgcfg_DATA = \
   nat-auto.conf
 
-bin_PROGRAMS = \
- gnunet-nat-auto \
- gnunet-nat-server
-
 libexec_PROGRAMS = \
  gnunet-service-nat-auto
 
-gnunet_nat_server_SOURCES = \
- gnunet-nat-server.c nat-auto.h
-gnunet_nat_server_LDADD = \
-  $(top_builddir)/src/service/nat/libgnunetnatnew.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_server_LDFLAGS = \
-  $(GN_LIBINTL)
-
-gnunet_nat_auto_SOURCES = \
-  gnunet-nat-auto.c nat-auto.h
-gnunet_nat_auto_LDADD = \
-  libgnunetnatauto.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-gnunet_nat_auto_LDFLAGS = \
-  $(GN_LIBINTL)
-
 if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c 
b/src/service/nat-auto/gnunet-nat-auto_legacy.c
similarity index 100%
rename from src/nat-auto/gnunet-nat-auto_legacy.c
rename to src/service/nat-auto/gnunet-nat-auto_legacy.c
diff --git a/src/nat-auto/gnunet-service-nat-auto.c 
b/src/service/nat-auto/gnunet-service-nat-auto.c
similarity index 100%
rename from src/nat-auto/gnunet-service-nat-auto.c
rename to src/service/nat-auto/gnunet-service-nat-auto.c
diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c 
b/src/service/nat-auto/gnunet-service-nat-auto_legacy.c
similarity index 100%
rename from src/nat-auto/gnunet-service-nat-auto_legacy.c
rename to src/service/nat-auto/gnunet-service-nat-auto_legacy.c
diff --git a/src/nat-auto/meson.build b/src/service/nat-auto/meson.build
similarity index 100%
rename from src/nat-auto/meson.build
rename to src/service/nat-auto/meson.build
diff --git a/src/nat-auto/nat-auto.conf.in 
b/src/service/nat-auto/nat-auto.conf.in
similarity index 100%
rename from src/nat-auto/nat-auto.conf.in
rename to src/service/nat-auto/nat-auto.conf.in
diff --git a/src/nat-auto/nat-auto.h b/src/service/nat-auto/nat-auto.h
similarity index 100%
rename from src/nat-auto/nat-auto.h
rename to src/service/nat-auto/nat-auto.h
diff --git a/src/nat-auto/nat_auto_api.c b/src/service/nat-auto/nat_auto_api.c
similarity index 100%
rename from src/nat-auto/nat_auto_api.c
rename to src/service/nat-auto/nat_auto_api.c
diff --git a/src/nat-auto/nat_auto_api_test.c 
b/src/service/nat-auto/nat_auto_api_test.c
similarity index 100%
rename from src/nat-auto/nat_auto_api_test.c
rename to src/service/nat-auto/nat_auto_api_test.c
diff --git a/src/regex/.gitignore b/src/service/regex/.gitignore
similarity index 100%
rename from src/regex/.gitignore
rename to src/service/regex/.gitignore
diff --git a/src/regex/Makefile.am b/src/service/regex/Makefile.am
similarity index 100%
rename from src/regex/Makefile.am
rename to src/service/regex/Makefile.am
diff --git a/src/regex/gnunet-daemon-regexprofiler.c 
b/src/service/regex/gnunet-daemon-regexprofiler.c
similarity index 100%
rename from src/regex/gnunet-daemon-regexprofiler.c
rename to src/service/regex/gnunet-daemon-regexprofiler.c
diff --git a/src/regex/gnunet-regex-profiler.c 
b/src/service/regex/gnunet-regex-profiler.c
similarity index 100%
rename from src/regex/gnunet-regex-profiler.c
rename to 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
similarity index 100%
rename from src/regex/gnunet-regex-simulation-profiler.c
rename to 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
similarity index 100%
rename from src/regex/gnunet-service-regex.c
rename to src/service/regex/gnunet-service-regex.c
diff --git a/src/regex/meson.build b/src/service/regex/meson.build
similarity index 100%
rename from src/regex/meson.build
rename to src/service/regex/meson.build
diff --git a/src/regex/perf-data.tar.gz b/src/service/regex/perf-data.tar.gz
similarity index 100%
rename from src/regex/perf-data.tar.gz
rename to src/service/regex/perf-data.tar.gz
diff --git a/src/regex/perf-regex.c b/src/service/regex/perf-regex.c
similarity index 100%
rename from src/regex/perf-regex.c
rename to src/service/regex/perf-regex.c
diff --git a/src/regex/plugin_block_regex.c 
b/src/service/regex/plugin_block_regex.c
similarity index 100%
rename from src/regex/plugin_block_regex.c
rename to src/service/regex/plugin_block_regex.c
diff --git a/src/regex/regex.conf.in b/src/service/regex/regex.conf.in
similarity index 100%
rename from src/regex/regex.conf.in
rename to src/service/regex/regex.conf.in
diff --git a/src/regex/regex_api_announce.c 
b/src/service/regex/regex_api_announce.c
similarity index 100%
rename from src/regex/regex_api_announce.c
rename to src/service/regex/regex_api_announce.c
diff --git a/src/regex/regex_api_search.c b/src/service/regex/regex_api_search.c
similarity index 100%
rename from src/regex/regex_api_search.c
rename to src/service/regex/regex_api_search.c
diff --git a/src/regex/regex_block_lib.c b/src/service/regex/regex_block_lib.c
similarity index 100%
rename from src/regex/regex_block_lib.c
rename to src/service/regex/regex_block_lib.c
diff --git a/src/regex/regex_block_lib.h b/src/service/regex/regex_block_lib.h
similarity index 100%
rename from src/regex/regex_block_lib.h
rename to src/service/regex/regex_block_lib.h
diff --git a/src/regex/regex_internal.c b/src/service/regex/regex_internal.c
similarity index 100%
rename from src/regex/regex_internal.c
rename to src/service/regex/regex_internal.c
diff --git a/src/regex/regex_internal.h b/src/service/regex/regex_internal.h
similarity index 100%
rename from src/regex/regex_internal.h
rename to src/service/regex/regex_internal.h
diff --git a/src/regex/regex_internal_dht.c 
b/src/service/regex/regex_internal_dht.c
similarity index 100%
rename from src/regex/regex_internal_dht.c
rename to src/service/regex/regex_internal_dht.c
diff --git a/src/regex/regex_internal_lib.h 
b/src/service/regex/regex_internal_lib.h
similarity index 100%
rename from src/regex/regex_internal_lib.h
rename to src/service/regex/regex_internal_lib.h
diff --git a/src/regex/regex_ipc.h b/src/service/regex/regex_ipc.h
similarity index 100%
rename from src/regex/regex_ipc.h
rename to 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
similarity index 100%
rename from src/regex/regex_simulation_profiler_test.conf
rename to 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
similarity index 100%
rename from src/regex/regex_test_graph.c
rename to src/service/regex/regex_test_graph.c
diff --git a/src/regex/regex_test_lib.c b/src/service/regex/regex_test_lib.c
similarity index 100%
rename from src/regex/regex_test_lib.c
rename to src/service/regex/regex_test_lib.c
diff --git a/src/regex/regex_test_lib.h b/src/service/regex/regex_test_lib.h
similarity index 100%
rename from src/regex/regex_test_lib.h
rename to src/service/regex/regex_test_lib.h
diff --git a/src/regex/regex_test_random.c 
b/src/service/regex/regex_test_random.c
similarity index 100%
rename from src/regex/regex_test_random.c
rename to src/service/regex/regex_test_random.c
diff --git a/src/regex/test_regex_api.c b/src/service/regex/test_regex_api.c
similarity index 100%
rename from src/regex/test_regex_api.c
rename to 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
similarity index 100%
rename from src/regex/test_regex_api_data.conf
rename to 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
similarity index 100%
rename from src/regex/test_regex_eval_api.c
rename to 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
similarity index 100%
rename from src/regex/test_regex_graph_api.c
rename to 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
similarity index 100%
rename from src/regex/test_regex_integration.c
rename to 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
similarity index 100%
rename from src/regex/test_regex_iterate_api.c
rename to 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
similarity index 100%
rename from src/regex/test_regex_proofs.c
rename to src/service/regex/test_regex_proofs.c
diff --git a/src/topology/.gitignore b/src/service/topology/.gitignore
similarity index 100%
rename from src/topology/.gitignore
rename to src/service/topology/.gitignore
diff --git a/src/topology/Makefile.am b/src/service/topology/Makefile.am
similarity index 100%
rename from src/topology/Makefile.am
rename to src/service/topology/Makefile.am
diff --git a/src/topology/gnunet-daemon-topology.c 
b/src/service/topology/gnunet-daemon-topology.c
similarity index 100%
rename from src/topology/gnunet-daemon-topology.c
rename to src/service/topology/gnunet-daemon-topology.c
diff --git a/src/topology/meson.build b/src/service/topology/meson.build
similarity index 100%
rename from src/topology/meson.build
rename to src/service/topology/meson.build
diff --git a/src/topology/test_gnunet_daemon_topology.c 
b/src/service/topology/test_gnunet_daemon_topology.c
similarity index 100%
rename from src/topology/test_gnunet_daemon_topology.c
rename to src/service/topology/test_gnunet_daemon_topology.c
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf 
b/src/service/topology/test_gnunet_daemon_topology_data.conf
similarity index 100%
rename from src/topology/test_gnunet_daemon_topology_data.conf
rename to src/service/topology/test_gnunet_daemon_topology_data.conf
diff --git a/src/topology/topology.conf b/src/service/topology/topology.conf
similarity index 100%
rename from src/topology/topology.conf
rename to src/service/topology/topology.conf
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)
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index 1c0d882d6..8f4e74588 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -27,6 +27,6 @@ gnunet_service_zonemaster_LDADD = \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(GN_LIBINTL) \
   -lpthread

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread]
Current Thread
[Next in Thread]
[gnunet] branch master updated (773211a4d -> 54a37c423), gnunet <=
- [gnunet] 04/06: BUILD: Move topology to service, gnunet, 2023/10/19
- [gnunet] 02/06: fot got to add file, gnunet, 2023/10/19
- [gnunet] 01/06: BUILD: Move template to service/cli, gnunet, 2023/10/19
- [gnunet] 03/06: BUILD: Move nat-auto to service/cli, gnunet, 2023/10/19
- [gnunet] 05/06: BUILD: Move regex/dns to service, gnunet, 2023/10/19
- [gnunet] 06/06: BUILD: Move namecache to service, gnunet, 2023/10/19
Prev by Date: [gnunet] 04/06: BUILD: Move topology to service
Next by Date: [gnunet] 02/06: fot got to add file
Previous by thread: [taler-exchange] branch master updated: fix link
Next by thread: [gnunet] 04/06: BUILD: Move topology to service
Index(es):
- Date
- Thread