31 files changed, 2 insertions, 2 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 10af79519..da3cd2d5f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  hostlist \
-  topology \
   regex \
   dns \
   namecache \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index f25006a37..6b4fa3264 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -9,6 +9,8 @@ SUBDIRS = \
         transport \
         core \
         nse \
+  hostlist \
+  topology \
         identity \
         rest \
         datacache \
diff --git a/src/hostlist/.gitignore b/src/service/hostlist/.gitignore
index b16e3444a..b16e3444a 100644
--- a/src/hostlist/.gitignore
+++ b/src/service/hostlist/.gitignore
diff --git a/src/hostlist/Makefile.am b/src/service/hostlist/Makefile.am
index fc9952aa6..fc9952aa6 100644
--- a/src/hostlist/Makefile.am
+++ b/src/service/hostlist/Makefile.am
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/service/hostlist/gnunet-daemon-hostlist.c
index 54e070f89..54e070f89 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/service/hostlist/gnunet-daemon-hostlist.c
diff --git a/src/hostlist/gnunet-daemon-hostlist.h b/src/service/hostlist/gnunet-daemon-hostlist.h
index aec413fe6..aec413fe6 100644
--- a/src/hostlist/gnunet-daemon-hostlist.h
+++ b/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
index aceea0aaf..aceea0aaf 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/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
index 2ee40d961..2ee40d961 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.h
+++ b/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
index c4a7aab03..c4a7aab03 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/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
index 13ba21e82..13ba21e82 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.h
+++ b/src/service/hostlist/gnunet-daemon-hostlist_server.h
diff --git a/src/hostlist/hostlist.conf b/src/service/hostlist/hostlist.conf
index d994ce9fb..d994ce9fb 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/service/hostlist/hostlist.conf
diff --git a/src/hostlist/hostlists_learn_peer2.file b/src/service/hostlist/hostlists_learn_peer2.file
index 19d031c3e..19d031c3e 100644
--- a/src/hostlist/hostlists_learn_peer2.file
+++ b/src/service/hostlist/hostlists_learn_peer2.file
diff --git a/src/hostlist/learning_data.conf b/src/service/hostlist/learning_data.conf
index 4252f2524..4252f2524 100644
--- a/src/hostlist/learning_data.conf
+++ b/src/service/hostlist/learning_data.conf
diff --git a/src/hostlist/meson.build b/src/service/hostlist/meson.build
index c05578334..c05578334 100644
--- a/src/hostlist/meson.build
+++ b/src/service/hostlist/meson.build
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/service/hostlist/test_gnunet_daemon_hostlist.c
index 063db2f99..063db2f99 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/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
index 9f853c244..9f853c244 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/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
index a0656f770..a0656f770 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/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
index 00c57c1e5..00c57c1e5 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/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
index 6bcd63fe7..6bcd63fe7 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/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
index 321f96f3d..321f96f3d 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/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
index dcd2790b0..dcd2790b0 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/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
index 3bee3c0c7..3bee3c0c7 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/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
index 0dafe6302..0dafe6302 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/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
index dc2956dcc..dc2956dcc 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/service/hostlist/test_learning_learn_peer2.conf
diff --git a/src/topology/.gitignore b/src/service/topology/.gitignore
index cfa95ec7e..cfa95ec7e 100644
--- a/src/topology/.gitignore
+++ b/src/service/topology/.gitignore
diff --git a/src/topology/Makefile.am b/src/service/topology/Makefile.am
index 7f5ad1893..7f5ad1893 100644
--- a/src/topology/Makefile.am
+++ b/src/service/topology/Makefile.am
diff --git a/src/topology/gnunet-daemon-topology.c b/src/service/topology/gnunet-daemon-topology.c
index efabac0fc..efabac0fc 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/service/topology/gnunet-daemon-topology.c
diff --git a/src/topology/meson.build b/src/service/topology/meson.build
index b196d98f2..b196d98f2 100644
--- a/src/topology/meson.build
+++ b/src/service/topology/meson.build
diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/service/topology/test_gnunet_daemon_topology.c
index 6f9758b09..6f9758b09 100644
--- a/src/topology/test_gnunet_daemon_topology.c
+++ b/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
index b1b3e9b88..b1b3e9b88 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/service/topology/test_gnunet_daemon_topology_data.conf
diff --git a/src/topology/topology.conf b/src/service/topology/topology.conf
index 45d8dd0c7..45d8dd0c7 100644
--- a/src/topology/topology.conf
+++ b/src/service/topology/topology.conf