gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] branch master updated (54a37c423 -> 98c00bad3)

From: gnunet
Subject: [gnunet] branch master updated (54a37c423 -> 98c00bad3)
Date: Thu, 19 Oct 2023 09:54:51 +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 54a37c423 BUILD: Move namecache to service
     new b7a1d4379 BUILD: Move namestore to service
     new 98c00bad3 BUILD: Move set/consensus/secretsharing to contrib/service

The 2 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                                       |  18 ++-
 po/POTFILES.in                                     |  81 ++++------
 src/Makefile.am                                    |   4 -
 src/cli/Makefile.am                                |   1 +
 src/cli/namestore/.gitignore                       |   6 +
 src/cli/namestore/Makefile.am                      |  71 +++++++++
 src/{ => cli}/namestore/example_zonefile           |   0
 src/{ => cli}/namestore/gnunet-namestore-dbtool.c  |   0
 .../namestore/gnunet-namestore-zonefile.c          |   0
 src/{ => cli}/namestore/gnunet-namestore.c         |   0
 src/{ => cli}/namestore/gnunet-zoneimport.c        |   0
 src/{ => cli}/namestore/test_namestore_delete.sh   |   0
 src/{ => cli}/namestore/test_namestore_lookup.sh   |   0
 src/{ => cli}/namestore/test_namestore_put.sh      |   0
 .../namestore/test_namestore_put_multiple.sh       |   0
 .../namestore/test_namestore_put_stdin.sh          |   0
 .../namestore/test_namestore_zonefile_import.sh    |   0
 src/contrib/service/Makefile.am                    |   3 +
 src/contrib/service/abd/Makefile.am                |   4 +-
 src/{ => contrib/service}/consensus/.gitignore     |   0
 src/{ => contrib/service}/consensus/Makefile.am    |   4 +-
 .../service}/consensus/consensus-simulation.py.in  |   0
 .../service}/consensus/consensus.conf.in           |   0
 src/{ => contrib/service}/consensus/consensus.h    |   0
 .../service}/consensus/consensus_api.c             |   0
 .../service}/consensus/consensus_protocol.h        |   0
 .../service}/consensus/gnunet-service-consensus.c  |   0
 src/{ => contrib/service}/consensus/meson.build    |   0
 .../service}/consensus/plugin_block_consensus.c    |   0
 .../service}/consensus/test_consensus.conf         |   0
 .../service}/consensus/test_consensus_api.c        |   0
 src/{ => contrib/service}/secretsharing/.gitignore |   0
 .../service}/secretsharing/Makefile.am             |   2 +-
 .../secretsharing/gnunet-secretsharing-profiler.c  |   0
 .../secretsharing/gnunet-service-secretsharing.c   |   0
 .../service}/secretsharing/meson.build             |   0
 .../service}/secretsharing/secretsharing.conf.in   |   0
 .../service}/secretsharing/secretsharing.h         |   0
 .../service}/secretsharing/secretsharing_api.c     |   0
 .../service}/secretsharing/secretsharing_common.c  |   0
 .../secretsharing/secretsharing_protocol.h         |   0
 .../service}/secretsharing/test_secretsharing.conf |   0
 .../secretsharing/test_secretsharing_api.c         |   0
 src/{ => contrib/service}/set/.gitignore           |   0
 src/{ => contrib/service}/set/Makefile.am          |   0
 src/{ => contrib/service}/set/gnunet-service-set.c |   0
 src/{ => contrib/service}/set/gnunet-service-set.h |   0
 .../service}/set/gnunet-service-set_intersection.c |   0
 .../service}/set/gnunet-service-set_intersection.h |   0
 .../service}/set/gnunet-service-set_protocol.h     |   0
 .../service}/set/gnunet-service-set_union.c        |   0
 .../service}/set/gnunet-service-set_union.h        |   0
 .../gnunet-service-set_union_strata_estimator.c    |   0
 .../gnunet-service-set_union_strata_estimator.h    |   0
 .../service}/set/gnunet-set-ibf-profiler.c         |   0
 .../service}/set/gnunet-set-profiler.c             |   0
 src/{ => contrib/service}/set/ibf.c                |   0
 src/{ => contrib/service}/set/ibf.h                |   0
 src/{ => contrib/service}/set/ibf_sim.c            |   0
 src/{ => contrib/service}/set/meson.build          |   0
 .../service}/set/plugin_block_set_test.c           |   0
 src/{ => contrib/service}/set/set.conf.in          |   0
 src/{ => contrib/service}/set/set.h                |   0
 src/{ => contrib/service}/set/set_api.c            |   0
 src/{ => contrib/service}/set/test_set.conf        |   0
 src/{ => contrib/service}/set/test_set_api.c       |   0
 .../set/test_set_intersection_result_full.c        |   0
 .../service}/set/test_set_union_copy.c             |   0
 .../service}/set/test_set_union_result_symmetric.c |   0
 src/conversation/Makefile.am                       |  10 +-
 src/gns/Makefile.am                                |   2 +-
 src/plugin/Makefile.am                             |   3 +-
 src/{ => plugin}/namestore/Makefile.am             | 168 ++++-----------------
 src/{ => plugin}/namestore/namestore-0001.sql      |   0
 src/{ => plugin}/namestore/namestore-drop.sql      |   0
 .../namestore/perf_namestore_api_import.c          |   0
 .../namestore/perf_namestore_api_postgres.conf     |   0
 .../namestore/perf_namestore_api_sqlite.conf       |   0
 .../namestore/perf_namestore_api_zone_iteration.c  |   0
 src/{ => plugin}/namestore/plugin_namestore_flat.c |   1 -
 .../namestore/plugin_namestore_postgres.c          |   1 -
 .../namestore/plugin_namestore_sqlite.c            |   1 -
 src/{ => plugin}/namestore/plugin_rest_namestore.c |   0
 src/{ => plugin}/namestore/test_common.c           |   0
 src/{ => plugin}/namestore/test_hostkey            |   0
 src/{ => plugin}/namestore/test_namestore_api.conf |   0
 .../namestore/test_namestore_api_edit_records.c    |   0
 .../namestore/test_namestore_api_lookup_nick.c     |   0
 .../namestore/test_namestore_api_monitoring.c      |   0
 .../test_namestore_api_monitoring_existing.c       |   0
 .../namestore/test_namestore_api_postgres.conf     |   0
 .../namestore/test_namestore_api_remove.c          |   0
 ...test_namestore_api_remove_not_existing_record.c |   0
 .../namestore/test_namestore_api_sqlite.conf       |   0
 .../namestore/test_namestore_api_store.c           |   0
 .../namestore/test_namestore_api_store_update.c    |   0
 .../namestore/test_namestore_api_tx_rollback.c     |   0
 .../namestore/test_namestore_api_zone_iteration.c  |   0
 .../test_namestore_api_zone_iteration_nick.c       |   0
 ...st_namestore_api_zone_iteration_specific_zone.c |   0
 .../test_namestore_api_zone_iteration_stop.c       |   0
 .../namestore/test_namestore_api_zone_to_name.c    |   0
 src/{ => plugin}/namestore/test_plugin_namestore.c |   0
 .../namestore/test_plugin_namestore_postgres.conf  |   0
 .../namestore/test_plugin_namestore_sqlite.conf    |   0
 .../namestore/test_plugin_rest_namestore.sh        |   0
 src/pt/Makefile.am                                 |   2 +-
 src/reclaim/Makefile.am                            |  14 +-
 src/service/Makefile.am                            |   1 +
 src/{ => service}/namestore/.gitignore             |   4 -
 src/service/namestore/Makefile.am                  |  63 ++++++++
 .../namestore/gnunet-namestore-fcfsd.c             |   0
 .../namestore/gnunet-service-namestore.c           |   0
 src/{ => service}/namestore/meson.build            |   0
 src/{ => service}/namestore/namestore.conf.in      |   0
 src/{ => service}/namestore/namestore.h            |   0
 src/{ => service}/namestore/namestore_api.c        |   0
 .../namestore/namestore_api_monitor.c              |   0
 src/zonemaster/Makefile.am                         |   2 +-
 119 files changed, 238 insertions(+), 228 deletions(-)
 create mode 100644 src/cli/namestore/.gitignore
 create mode 100644 src/cli/namestore/Makefile.am
 rename src/{ => cli}/namestore/example_zonefile (100%)
 rename src/{ => cli}/namestore/gnunet-namestore-dbtool.c (100%)
 rename src/{ => cli}/namestore/gnunet-namestore-zonefile.c (100%)
 rename src/{ => cli}/namestore/gnunet-namestore.c (100%)
 rename src/{ => cli}/namestore/gnunet-zoneimport.c (100%)
 rename src/{ => cli}/namestore/test_namestore_delete.sh (100%)
 rename src/{ => cli}/namestore/test_namestore_lookup.sh (100%)
 rename src/{ => cli}/namestore/test_namestore_put.sh (100%)
 rename src/{ => cli}/namestore/test_namestore_put_multiple.sh (100%)
 rename src/{ => cli}/namestore/test_namestore_put_stdin.sh (100%)
 rename src/{ => cli}/namestore/test_namestore_zonefile_import.sh (100%)
 rename src/{ => contrib/service}/consensus/.gitignore (100%)
 rename src/{ => contrib/service}/consensus/Makefile.am (95%)
 rename src/{ => contrib/service}/consensus/consensus-simulation.py.in (100%)
 rename src/{ => contrib/service}/consensus/consensus.conf.in (100%)
 rename src/{ => contrib/service}/consensus/consensus.h (100%)
 rename src/{ => contrib/service}/consensus/consensus_api.c (100%)
 rename src/{ => contrib/service}/consensus/consensus_protocol.h (100%)
 rename src/{ => contrib/service}/consensus/gnunet-service-consensus.c (100%)
 rename src/{ => contrib/service}/consensus/meson.build (100%)
 rename src/{ => contrib/service}/consensus/plugin_block_consensus.c (100%)
 rename src/{ => contrib/service}/consensus/test_consensus.conf (100%)
 rename src/{ => contrib/service}/consensus/test_consensus_api.c (100%)
 rename src/{ => contrib/service}/secretsharing/.gitignore (100%)
 rename src/{ => contrib/service}/secretsharing/Makefile.am (96%)
 rename src/{ => contrib/service}/secretsharing/gnunet-secretsharing-profiler.c 
(100%)
 rename src/{ => contrib/service}/secretsharing/gnunet-service-secretsharing.c 
(100%)
 rename src/{ => contrib/service}/secretsharing/meson.build (100%)
 rename src/{ => contrib/service}/secretsharing/secretsharing.conf.in (100%)
 rename src/{ => contrib/service}/secretsharing/secretsharing.h (100%)
 rename src/{ => contrib/service}/secretsharing/secretsharing_api.c (100%)
 rename src/{ => contrib/service}/secretsharing/secretsharing_common.c (100%)
 rename src/{ => contrib/service}/secretsharing/secretsharing_protocol.h (100%)
 rename src/{ => contrib/service}/secretsharing/test_secretsharing.conf (100%)
 rename src/{ => contrib/service}/secretsharing/test_secretsharing_api.c (100%)
 rename src/{ => contrib/service}/set/.gitignore (100%)
 rename src/{ => contrib/service}/set/Makefile.am (100%)
 rename src/{ => contrib/service}/set/gnunet-service-set.c (100%)
 rename src/{ => contrib/service}/set/gnunet-service-set.h (100%)
 rename src/{ => contrib/service}/set/gnunet-service-set_intersection.c (100%)
 rename src/{ => contrib/service}/set/gnunet-service-set_intersection.h (100%)
 rename src/{ => contrib/service}/set/gnunet-service-set_protocol.h (100%)
 rename src/{ => contrib/service}/set/gnunet-service-set_union.c (100%)
 rename src/{ => contrib/service}/set/gnunet-service-set_union.h (100%)
 rename src/{ => 
contrib/service}/set/gnunet-service-set_union_strata_estimator.c (100%)
 rename src/{ => 
contrib/service}/set/gnunet-service-set_union_strata_estimator.h (100%)
 rename src/{ => contrib/service}/set/gnunet-set-ibf-profiler.c (100%)
 rename src/{ => contrib/service}/set/gnunet-set-profiler.c (100%)
 rename src/{ => contrib/service}/set/ibf.c (100%)
 rename src/{ => contrib/service}/set/ibf.h (100%)
 rename src/{ => contrib/service}/set/ibf_sim.c (100%)
 rename src/{ => contrib/service}/set/meson.build (100%)
 rename src/{ => contrib/service}/set/plugin_block_set_test.c (100%)
 rename src/{ => contrib/service}/set/set.conf.in (100%)
 rename src/{ => contrib/service}/set/set.h (100%)
 rename src/{ => contrib/service}/set/set_api.c (100%)
 rename src/{ => contrib/service}/set/test_set.conf (100%)
 rename src/{ => contrib/service}/set/test_set_api.c (100%)
 rename src/{ => contrib/service}/set/test_set_intersection_result_full.c (100%)
 rename src/{ => contrib/service}/set/test_set_union_copy.c (100%)
 rename src/{ => contrib/service}/set/test_set_union_result_symmetric.c (100%)
 rename src/{ => plugin}/namestore/Makefile.am (81%)
 rename src/{ => plugin}/namestore/namestore-0001.sql (100%)
 rename src/{ => plugin}/namestore/namestore-drop.sql (100%)
 rename src/{ => plugin}/namestore/perf_namestore_api_import.c (100%)
 rename src/{ => plugin}/namestore/perf_namestore_api_postgres.conf (100%)
 rename src/{ => plugin}/namestore/perf_namestore_api_sqlite.conf (100%)
 rename src/{ => plugin}/namestore/perf_namestore_api_zone_iteration.c (100%)
 rename src/{ => plugin}/namestore/plugin_namestore_flat.c (99%)
 rename src/{ => plugin}/namestore/plugin_namestore_postgres.c (99%)
 rename src/{ => plugin}/namestore/plugin_namestore_sqlite.c (99%)
 rename src/{ => plugin}/namestore/plugin_rest_namestore.c (100%)
 rename src/{ => plugin}/namestore/test_common.c (100%)
 rename src/{ => plugin}/namestore/test_hostkey (100%)
 rename src/{ => plugin}/namestore/test_namestore_api.conf (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_edit_records.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_lookup_nick.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_monitoring.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_monitoring_existing.c 
(100%)
 rename src/{ => plugin}/namestore/test_namestore_api_postgres.conf (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_remove.c (100%)
 rename src/{ => 
plugin}/namestore/test_namestore_api_remove_not_existing_record.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_sqlite.conf (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_store.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_store_update.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_tx_rollback.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_zone_iteration.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_zone_iteration_nick.c 
(100%)
 rename src/{ => 
plugin}/namestore/test_namestore_api_zone_iteration_specific_zone.c (100%)
 rename src/{ => plugin}/namestore/test_namestore_api_zone_iteration_stop.c 
(100%)
 rename src/{ => plugin}/namestore/test_namestore_api_zone_to_name.c (100%)
 rename src/{ => plugin}/namestore/test_plugin_namestore.c (100%)
 rename src/{ => plugin}/namestore/test_plugin_namestore_postgres.conf (100%)
 rename src/{ => plugin}/namestore/test_plugin_namestore_sqlite.conf (100%)
 rename src/{ => plugin}/namestore/test_plugin_rest_namestore.sh (100%)
 rename src/{ => service}/namestore/.gitignore (96%)
 create mode 100644 src/service/namestore/Makefile.am
 rename src/{ => service}/namestore/gnunet-namestore-fcfsd.c (100%)
 rename src/{ => service}/namestore/gnunet-service-namestore.c (100%)
 rename src/{ => service}/namestore/meson.build (100%)
 rename src/{ => service}/namestore/namestore.conf.in (100%)
 rename src/{ => service}/namestore/namestore.h (100%)
 rename src/{ => service}/namestore/namestore_api.c (100%)
 rename src/{ => service}/namestore/namestore_api_monitor.c (100%)

diff --git a/configure.ac b/configure.ac
index df0f29095..5df94e8e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1242,6 +1242,7 @@ src/plugin/block/Makefile
 src/plugin/dhtu/Makefile
 src/plugin/gnsrecord/Makefile
 src/plugin/namecache/Makefile
+src/plugin/namestore/Makefile
 src/service/Makefile
 src/service/arm/Makefile
 src/service/arm/arm.conf
@@ -1261,6 +1262,8 @@ src/service/identity/Makefile
 src/service/identity/identity.conf
 src/service/namecache/Makefile
 src/service/namecache/namecache.conf
+src/service/namestore/Makefile
+src/service/namestore/namestore.conf
 src/service/nat/Makefile
 src/service/nat/nat.conf
 src/service/nat-auto/Makefile
@@ -1289,6 +1292,7 @@ src/cli/core/Makefile
 src/cli/datastore/Makefile
 src/cli/dht/Makefile
 src/cli/namecache/Makefile
+src/cli/namestore/Makefile
 src/cli/nat/Makefile
 src/cli/nat-auto/Makefile
 src/cli/nse/Makefile
@@ -1299,12 +1303,16 @@ src/contrib/service/Makefile
 src/contrib/service/abd/Makefile
 src/contrib/service/abd/abd.conf
 src/contrib/service/auction/Makefile
+src/contrib/service/consensus/Makefile
+src/contrib/service/consensus/consensus.conf
+src/contrib/service/secretsharing/Makefile
+src/contrib/service/secretsharing/secretsharing.conf
+src/contrib/service/set/Makefile
+src/contrib/service/set/set.conf
 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/exit/Makefile
@@ -1316,17 +1324,11 @@ src/gns/nss/Makefile
 src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
-src/namestore/Makefile
-src/namestore/namestore.conf
 src/pt/Makefile
 src/revocation/Makefile
 src/revocation/revocation.conf
-src/secretsharing/Makefile
-src/secretsharing/secretsharing.conf
 src/scalarproduct/Makefile
 src/scalarproduct/scalarproduct.conf
-src/set/Makefile
-src/set/set.conf
 src/seti/Makefile
 src/seti/seti.conf
 src/setu/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d34922beb..05bc968e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,10 @@ 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/namestore/gnunet-namestore-dbtool.c
+src/cli/namestore/gnunet-namestore-zonefile.c
+src/cli/namestore/gnunet-namestore.c
+src/cli/namestore/gnunet-zoneimport.c
 src/cli/nat-auto/gnunet-nat-auto.c
 src/cli/nat-auto/gnunet-nat-server.c
 src/cli/nat/gnunet-nat.c
@@ -23,9 +27,6 @@ src/cli/util/gnunet-resolver.c
 src/cli/util/gnunet-scrypt.c
 src/cli/util/gnunet-timeout.c
 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
@@ -37,6 +38,9 @@ src/contrib/service/auction/gnunet-auction-create.c
 src/contrib/service/auction/gnunet-auction-info.c
 src/contrib/service/auction/gnunet-auction-join.c
 src/contrib/service/auction/gnunet-service-auction.c
+src/contrib/service/consensus/consensus_api.c
+src/contrib/service/consensus/gnunet-service-consensus.c
+src/contrib/service/consensus/plugin_block_consensus.c
 src/contrib/service/rps/gnunet-rps-profiler.c
 src/contrib/service/rps/gnunet-rps.c
 src/contrib/service/rps/gnunet-service-rps.c
@@ -48,6 +52,20 @@ 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/secretsharing/gnunet-secretsharing-profiler.c
+src/contrib/service/secretsharing/gnunet-service-secretsharing.c
+src/contrib/service/secretsharing/secretsharing_api.c
+src/contrib/service/secretsharing/secretsharing_common.c
+src/contrib/service/set/gnunet-service-set.c
+src/contrib/service/set/gnunet-service-set_intersection.c
+src/contrib/service/set/gnunet-service-set_union.c
+src/contrib/service/set/gnunet-service-set_union_strata_estimator.c
+src/contrib/service/set/gnunet-set-ibf-profiler.c
+src/contrib/service/set/gnunet-set-profiler.c
+src/contrib/service/set/ibf.c
+src/contrib/service/set/ibf_sim.c
+src/contrib/service/set/plugin_block_set_test.c
+src/contrib/service/set/set_api.c
 src/contrib/service/template/gnunet-service-template.c
 src/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
@@ -256,18 +274,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/namestore/gnunet-namestore-dbtool.c
-src/namestore/gnunet-namestore-fcfsd.c
-src/namestore/gnunet-namestore-zonefile.c
-src/namestore/gnunet-namestore.c
-src/namestore/gnunet-service-namestore.c
-src/namestore/gnunet-zoneimport.c
-src/namestore/namestore_api.c
-src/namestore/namestore_api_monitor.c
-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/plugin/block/plugin_block_template.c
 src/plugin/block/plugin_block_test.c
 src/plugin/dhtu/plugin_dhtu_gnunet.c
@@ -277,6 +283,10 @@ 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/plugin/namestore/plugin_namestore_flat.c
+src/plugin/namestore/plugin_namestore_postgres.c
+src/plugin/namestore/plugin_namestore_sqlite.c
+src/plugin/namestore/plugin_rest_namestore.c
 src/pt/gnunet-daemon-pt.c
 src/reclaim/did_core.c
 src/reclaim/did_helper.c
@@ -312,10 +322,6 @@ src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
 src/scalarproduct/gnunet-service-scalarproduct_alice.c
 src/scalarproduct/gnunet-service-scalarproduct_bob.c
 src/scalarproduct/scalarproduct_api.c
-src/secretsharing/gnunet-secretsharing-profiler.c
-src/secretsharing/gnunet-service-secretsharing.c
-src/secretsharing/secretsharing_api.c
-src/secretsharing/secretsharing_common.c
 src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
@@ -381,6 +387,10 @@ 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/namestore/gnunet-namestore-fcfsd.c
+src/service/namestore/gnunet-service-namestore.c
+src/service/namestore/namestore_api.c
+src/service/namestore/namestore_api_monitor.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
@@ -469,16 +479,6 @@ src/service/transport/transport_api_cmd_start_peer.c
 src/service/transport/transport_api_cmd_stop_peer.c
 src/service/transport/transport_api_traits.c
 src/service/util/gnunet-service-resolver.c
-src/set/gnunet-service-set.c
-src/set/gnunet-service-set_intersection.c
-src/set/gnunet-service-set_union.c
-src/set/gnunet-service-set_union_strata_estimator.c
-src/set/gnunet-set-ibf-profiler.c
-src/set/gnunet-set-profiler.c
-src/set/ibf.c
-src/set/ibf_sim.c
-src/set/plugin_block_set_test.c
-src/set/set_api.c
 src/seti/gnunet-service-seti.c
 src/seti/gnunet-seti-profiler.c
 src/seti/plugin_block_seti_test.c
@@ -491,29 +491,6 @@ src/setu/ibf.c
 src/setu/ibf_sim.c
 src/setu/plugin_block_setu_test.c
 src/setu/setu_api.c
-src/test/dhtu/testing_dhtu_cmd_send.c
-src/test/testing/gnunet-cmds-helper.c
-src/test/testing/gnunet-testing.c
-src/test/testing/list-keys.c
-src/test/testing/testing.c
-src/test/testing/testing_api_cmd_barrier.c
-src/test/testing/testing_api_cmd_barrier_reached.c
-src/test/testing/testing_api_cmd_batch.c
-src/test/testing/testing_api_cmd_block_until_external_trigger.c
-src/test/testing/testing_api_cmd_exec_bash_script.c
-src/test/testing/testing_api_cmd_finish.c
-src/test/testing/testing_api_cmd_local_test_prepared.c
-src/test/testing/testing_api_cmd_netjail_start.c
-src/test/testing/testing_api_cmd_netjail_start_cmds_helper.c
-src/test/testing/testing_api_cmd_netjail_stop.c
-src/test/testing/testing_api_cmd_netjail_stop_cmds_helper.c
-src/test/testing/testing_api_cmd_send_peer_ready.c
-src/test/testing/testing_api_cmd_start_peer.c
-src/test/testing/testing_api_cmd_stop_peer.c
-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/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 d166fd788..0cafaf276 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,11 +17,8 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  namestore \
-  set \
   seti \
   setu \
-  consensus \
   scalarproduct \
   revocation \
   vpn \
@@ -31,6 +28,5 @@ SUBDIRS = \
   fs \
   exit \
   pt \
-  secretsharing \
   reclaim \
   messenger
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 0235c0a1c..78ff8b07b 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -9,4 +9,5 @@ SUBDIRS = \
        datastore \
        dht \
        namecache \
+       namestore \
        cadet
diff --git a/src/cli/namestore/.gitignore b/src/cli/namestore/.gitignore
new file mode 100644
index 000000000..3c0282e8c
--- /dev/null
+++ b/src/cli/namestore/.gitignore
@@ -0,0 +1,6 @@
+gnunet-namestore
+gnunet-namestore-dbtool
+gnunet-namestore-zonefile
+gnunet-namestore-fcfsd
+gnunet-zoneimport
+
diff --git a/src/cli/namestore/Makefile.am b/src/cli/namestore/Makefile.am
new file mode 100644
index 000000000..86ab2f0f7
--- /dev/null
+++ b/src/cli/namestore/Makefile.am
@@ -0,0 +1,71 @@
+# 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/
+
+sqldir = $(prefix)/share/gnunet/sql/
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+
+bin_PROGRAMS = \
+ gnunet-namestore \
+ gnunet-namestore-dbtool \
+ gnunet-namestore-zonefile \
+ gnunet-zoneimport
+
+gnunet_namestore_zonefile_SOURCES = \
+ gnunet-namestore-zonefile.c
+gnunet_namestore_zonefile_LDADD = \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_zoneimport_SOURCES = \
+ gnunet-zoneimport.c
+gnunet_zoneimport_LDADD = \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_namestore_SOURCES = \
+ gnunet-namestore.c
+gnunet_namestore_LDADD = \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(GN_LIBINTL)
+
+gnunet_namestore_dbtool_SOURCES = \
+ gnunet-namestore-dbtool.c
+gnunet_namestore_dbtool_LDADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(GN_LIBINTL)
+
+
+
+check_SCRIPTS = \
+  test_namestore_put.sh \
+  test_namestore_put_stdin.sh \
+  test_namestore_lookup.sh \
+  test_namestore_delete.sh \
+  test_namestore_zonefile_import.sh
+
+EXTRA_DIST = \
+  test_hostkey \
+  example_zonefile \
+  $(check_SCRIPTS)
diff --git a/src/namestore/example_zonefile b/src/cli/namestore/example_zonefile
similarity index 100%
rename from src/namestore/example_zonefile
rename to src/cli/namestore/example_zonefile
diff --git a/src/namestore/gnunet-namestore-dbtool.c 
b/src/cli/namestore/gnunet-namestore-dbtool.c
similarity index 100%
rename from src/namestore/gnunet-namestore-dbtool.c
rename to src/cli/namestore/gnunet-namestore-dbtool.c
diff --git a/src/namestore/gnunet-namestore-zonefile.c 
b/src/cli/namestore/gnunet-namestore-zonefile.c
similarity index 100%
rename from src/namestore/gnunet-namestore-zonefile.c
rename to src/cli/namestore/gnunet-namestore-zonefile.c
diff --git a/src/namestore/gnunet-namestore.c 
b/src/cli/namestore/gnunet-namestore.c
similarity index 100%
rename from src/namestore/gnunet-namestore.c
rename to src/cli/namestore/gnunet-namestore.c
diff --git a/src/namestore/gnunet-zoneimport.c 
b/src/cli/namestore/gnunet-zoneimport.c
similarity index 100%
rename from src/namestore/gnunet-zoneimport.c
rename to src/cli/namestore/gnunet-zoneimport.c
diff --git a/src/namestore/test_namestore_delete.sh 
b/src/cli/namestore/test_namestore_delete.sh
similarity index 100%
rename from src/namestore/test_namestore_delete.sh
rename to src/cli/namestore/test_namestore_delete.sh
diff --git a/src/namestore/test_namestore_lookup.sh 
b/src/cli/namestore/test_namestore_lookup.sh
similarity index 100%
rename from src/namestore/test_namestore_lookup.sh
rename to src/cli/namestore/test_namestore_lookup.sh
diff --git a/src/namestore/test_namestore_put.sh 
b/src/cli/namestore/test_namestore_put.sh
similarity index 100%
rename from src/namestore/test_namestore_put.sh
rename to src/cli/namestore/test_namestore_put.sh
diff --git a/src/namestore/test_namestore_put_multiple.sh 
b/src/cli/namestore/test_namestore_put_multiple.sh
similarity index 100%
rename from src/namestore/test_namestore_put_multiple.sh
rename to src/cli/namestore/test_namestore_put_multiple.sh
diff --git a/src/namestore/test_namestore_put_stdin.sh 
b/src/cli/namestore/test_namestore_put_stdin.sh
similarity index 100%
rename from src/namestore/test_namestore_put_stdin.sh
rename to src/cli/namestore/test_namestore_put_stdin.sh
diff --git a/src/namestore/test_namestore_zonefile_import.sh 
b/src/cli/namestore/test_namestore_zonefile_import.sh
similarity index 100%
rename from src/namestore/test_namestore_zonefile_import.sh
rename to src/cli/namestore/test_namestore_zonefile_import.sh
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
index d7cb9946d..cfab56206 100644
--- a/src/contrib/service/Makefile.am
+++ b/src/contrib/service/Makefile.am
@@ -7,4 +7,7 @@ endif
 
 SUBDIRS = \
        template \
+       set \
+       consensus \
+       secretsharing \
        $(EXP_DIR)
diff --git a/src/contrib/service/abd/Makefile.am 
b/src/contrib/service/abd/Makefile.am
index 6eff980f4..d08a6a4a7 100644
--- a/src/contrib/service/abd/Makefile.am
+++ b/src/contrib/service/abd/Makefile.am
@@ -44,7 +44,7 @@ gnunet_abd_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(GN_LIBINTL)
 
 
@@ -66,7 +66,7 @@ gnunet_service_abd_LDADD = \
        libgnunetabd.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
        $(top_builddir)/src/gns/libgnunetgns.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
+       $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
diff --git a/src/consensus/.gitignore b/src/contrib/service/consensus/.gitignore
similarity index 100%
rename from src/consensus/.gitignore
rename to src/contrib/service/consensus/.gitignore
diff --git a/src/consensus/Makefile.am 
b/src/contrib/service/consensus/Makefile.am
similarity index 95%
rename from src/consensus/Makefile.am
rename to src/contrib/service/consensus/Makefile.am
index a578a62cc..69405b90e 100644
--- a/src/consensus/Makefile.am
+++ b/src/contrib/service/consensus/Makefile.am
@@ -40,7 +40,7 @@ gnunet_service_consensus_SOURCES = \
 gnunet_service_consensus_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/contrib/service/set/libgnunetset.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
 
@@ -50,7 +50,7 @@ gnunet_service_evil_consensus_SOURCES = \
 gnunet_service_evil_consensus_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/contrib/service/set/libgnunetset.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
 gnunet_service_evil_consensus_CFLAGS = -DEVIL
diff --git a/src/consensus/consensus-simulation.py.in 
b/src/contrib/service/consensus/consensus-simulation.py.in
similarity index 100%
rename from src/consensus/consensus-simulation.py.in
rename to src/contrib/service/consensus/consensus-simulation.py.in
diff --git a/src/consensus/consensus.conf.in 
b/src/contrib/service/consensus/consensus.conf.in
similarity index 100%
rename from src/consensus/consensus.conf.in
rename to src/contrib/service/consensus/consensus.conf.in
diff --git a/src/consensus/consensus.h 
b/src/contrib/service/consensus/consensus.h
similarity index 100%
rename from src/consensus/consensus.h
rename to src/contrib/service/consensus/consensus.h
diff --git a/src/consensus/consensus_api.c 
b/src/contrib/service/consensus/consensus_api.c
similarity index 100%
rename from src/consensus/consensus_api.c
rename to src/contrib/service/consensus/consensus_api.c
diff --git a/src/consensus/consensus_protocol.h 
b/src/contrib/service/consensus/consensus_protocol.h
similarity index 100%
rename from src/consensus/consensus_protocol.h
rename to src/contrib/service/consensus/consensus_protocol.h
diff --git a/src/consensus/gnunet-service-consensus.c 
b/src/contrib/service/consensus/gnunet-service-consensus.c
similarity index 100%
rename from src/consensus/gnunet-service-consensus.c
rename to src/contrib/service/consensus/gnunet-service-consensus.c
diff --git a/src/consensus/meson.build 
b/src/contrib/service/consensus/meson.build
similarity index 100%
rename from src/consensus/meson.build
rename to src/contrib/service/consensus/meson.build
diff --git a/src/consensus/plugin_block_consensus.c 
b/src/contrib/service/consensus/plugin_block_consensus.c
similarity index 100%
rename from src/consensus/plugin_block_consensus.c
rename to src/contrib/service/consensus/plugin_block_consensus.c
diff --git a/src/consensus/test_consensus.conf 
b/src/contrib/service/consensus/test_consensus.conf
similarity index 100%
rename from src/consensus/test_consensus.conf
rename to src/contrib/service/consensus/test_consensus.conf
diff --git a/src/consensus/test_consensus_api.c 
b/src/contrib/service/consensus/test_consensus_api.c
similarity index 100%
rename from src/consensus/test_consensus_api.c
rename to src/contrib/service/consensus/test_consensus_api.c
diff --git a/src/secretsharing/.gitignore 
b/src/contrib/service/secretsharing/.gitignore
similarity index 100%
rename from src/secretsharing/.gitignore
rename to src/contrib/service/secretsharing/.gitignore
diff --git a/src/secretsharing/Makefile.am 
b/src/contrib/service/secretsharing/Makefile.am
similarity index 96%
rename from src/secretsharing/Makefile.am
rename to src/contrib/service/secretsharing/Makefile.am
index c22d57fea..afc42309c 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/contrib/service/secretsharing/Makefile.am
@@ -40,7 +40,7 @@ gnunet_service_secretsharing_SOURCES = \
 gnunet_service_secretsharing_CFLAGS = $(AM_CFLAGS)
 gnunet_service_secretsharing_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la \
+  $(top_builddir)/src/contrib/service/consensus/libgnunetconsensus.la \
   $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL)
 
diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c 
b/src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c
similarity index 100%
rename from src/secretsharing/gnunet-secretsharing-profiler.c
rename to src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c
diff --git a/src/secretsharing/gnunet-service-secretsharing.c 
b/src/contrib/service/secretsharing/gnunet-service-secretsharing.c
similarity index 100%
rename from src/secretsharing/gnunet-service-secretsharing.c
rename to src/contrib/service/secretsharing/gnunet-service-secretsharing.c
diff --git a/src/secretsharing/meson.build 
b/src/contrib/service/secretsharing/meson.build
similarity index 100%
rename from src/secretsharing/meson.build
rename to src/contrib/service/secretsharing/meson.build
diff --git a/src/secretsharing/secretsharing.conf.in 
b/src/contrib/service/secretsharing/secretsharing.conf.in
similarity index 100%
rename from src/secretsharing/secretsharing.conf.in
rename to src/contrib/service/secretsharing/secretsharing.conf.in
diff --git a/src/secretsharing/secretsharing.h 
b/src/contrib/service/secretsharing/secretsharing.h
similarity index 100%
rename from src/secretsharing/secretsharing.h
rename to src/contrib/service/secretsharing/secretsharing.h
diff --git a/src/secretsharing/secretsharing_api.c 
b/src/contrib/service/secretsharing/secretsharing_api.c
similarity index 100%
rename from src/secretsharing/secretsharing_api.c
rename to src/contrib/service/secretsharing/secretsharing_api.c
diff --git a/src/secretsharing/secretsharing_common.c 
b/src/contrib/service/secretsharing/secretsharing_common.c
similarity index 100%
rename from src/secretsharing/secretsharing_common.c
rename to src/contrib/service/secretsharing/secretsharing_common.c
diff --git a/src/secretsharing/secretsharing_protocol.h 
b/src/contrib/service/secretsharing/secretsharing_protocol.h
similarity index 100%
rename from src/secretsharing/secretsharing_protocol.h
rename to src/contrib/service/secretsharing/secretsharing_protocol.h
diff --git a/src/secretsharing/test_secretsharing.conf 
b/src/contrib/service/secretsharing/test_secretsharing.conf
similarity index 100%
rename from src/secretsharing/test_secretsharing.conf
rename to src/contrib/service/secretsharing/test_secretsharing.conf
diff --git a/src/secretsharing/test_secretsharing_api.c 
b/src/contrib/service/secretsharing/test_secretsharing_api.c
similarity index 100%
rename from src/secretsharing/test_secretsharing_api.c
rename to src/contrib/service/secretsharing/test_secretsharing_api.c
diff --git a/src/set/.gitignore b/src/contrib/service/set/.gitignore
similarity index 100%
rename from src/set/.gitignore
rename to src/contrib/service/set/.gitignore
diff --git a/src/set/Makefile.am b/src/contrib/service/set/Makefile.am
similarity index 100%
rename from src/set/Makefile.am
rename to src/contrib/service/set/Makefile.am
diff --git a/src/set/gnunet-service-set.c 
b/src/contrib/service/set/gnunet-service-set.c
similarity index 100%
rename from src/set/gnunet-service-set.c
rename to src/contrib/service/set/gnunet-service-set.c
diff --git a/src/set/gnunet-service-set.h 
b/src/contrib/service/set/gnunet-service-set.h
similarity index 100%
rename from src/set/gnunet-service-set.h
rename to src/contrib/service/set/gnunet-service-set.h
diff --git a/src/set/gnunet-service-set_intersection.c 
b/src/contrib/service/set/gnunet-service-set_intersection.c
similarity index 100%
rename from src/set/gnunet-service-set_intersection.c
rename to src/contrib/service/set/gnunet-service-set_intersection.c
diff --git a/src/set/gnunet-service-set_intersection.h 
b/src/contrib/service/set/gnunet-service-set_intersection.h
similarity index 100%
rename from src/set/gnunet-service-set_intersection.h
rename to src/contrib/service/set/gnunet-service-set_intersection.h
diff --git a/src/set/gnunet-service-set_protocol.h 
b/src/contrib/service/set/gnunet-service-set_protocol.h
similarity index 100%
rename from src/set/gnunet-service-set_protocol.h
rename to src/contrib/service/set/gnunet-service-set_protocol.h
diff --git a/src/set/gnunet-service-set_union.c 
b/src/contrib/service/set/gnunet-service-set_union.c
similarity index 100%
rename from src/set/gnunet-service-set_union.c
rename to src/contrib/service/set/gnunet-service-set_union.c
diff --git a/src/set/gnunet-service-set_union.h 
b/src/contrib/service/set/gnunet-service-set_union.h
similarity index 100%
rename from src/set/gnunet-service-set_union.h
rename to src/contrib/service/set/gnunet-service-set_union.h
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c 
b/src/contrib/service/set/gnunet-service-set_union_strata_estimator.c
similarity index 100%
rename from src/set/gnunet-service-set_union_strata_estimator.c
rename to src/contrib/service/set/gnunet-service-set_union_strata_estimator.c
diff --git a/src/set/gnunet-service-set_union_strata_estimator.h 
b/src/contrib/service/set/gnunet-service-set_union_strata_estimator.h
similarity index 100%
rename from src/set/gnunet-service-set_union_strata_estimator.h
rename to src/contrib/service/set/gnunet-service-set_union_strata_estimator.h
diff --git a/src/set/gnunet-set-ibf-profiler.c 
b/src/contrib/service/set/gnunet-set-ibf-profiler.c
similarity index 100%
rename from src/set/gnunet-set-ibf-profiler.c
rename to src/contrib/service/set/gnunet-set-ibf-profiler.c
diff --git a/src/set/gnunet-set-profiler.c 
b/src/contrib/service/set/gnunet-set-profiler.c
similarity index 100%
rename from src/set/gnunet-set-profiler.c
rename to src/contrib/service/set/gnunet-set-profiler.c
diff --git a/src/set/ibf.c b/src/contrib/service/set/ibf.c
similarity index 100%
rename from src/set/ibf.c
rename to src/contrib/service/set/ibf.c
diff --git a/src/set/ibf.h b/src/contrib/service/set/ibf.h
similarity index 100%
rename from src/set/ibf.h
rename to src/contrib/service/set/ibf.h
diff --git a/src/set/ibf_sim.c b/src/contrib/service/set/ibf_sim.c
similarity index 100%
rename from src/set/ibf_sim.c
rename to src/contrib/service/set/ibf_sim.c
diff --git a/src/set/meson.build b/src/contrib/service/set/meson.build
similarity index 100%
rename from src/set/meson.build
rename to src/contrib/service/set/meson.build
diff --git a/src/set/plugin_block_set_test.c 
b/src/contrib/service/set/plugin_block_set_test.c
similarity index 100%
rename from src/set/plugin_block_set_test.c
rename to src/contrib/service/set/plugin_block_set_test.c
diff --git a/src/set/set.conf.in b/src/contrib/service/set/set.conf.in
similarity index 100%
rename from src/set/set.conf.in
rename to src/contrib/service/set/set.conf.in
diff --git a/src/set/set.h b/src/contrib/service/set/set.h
similarity index 100%
rename from src/set/set.h
rename to src/contrib/service/set/set.h
diff --git a/src/set/set_api.c b/src/contrib/service/set/set_api.c
similarity index 100%
rename from src/set/set_api.c
rename to src/contrib/service/set/set_api.c
diff --git a/src/set/test_set.conf b/src/contrib/service/set/test_set.conf
similarity index 100%
rename from src/set/test_set.conf
rename to src/contrib/service/set/test_set.conf
diff --git a/src/set/test_set_api.c b/src/contrib/service/set/test_set_api.c
similarity index 100%
rename from src/set/test_set_api.c
rename to src/contrib/service/set/test_set_api.c
diff --git a/src/set/test_set_intersection_result_full.c 
b/src/contrib/service/set/test_set_intersection_result_full.c
similarity index 100%
rename from src/set/test_set_intersection_result_full.c
rename to src/contrib/service/set/test_set_intersection_result_full.c
diff --git a/src/set/test_set_union_copy.c 
b/src/contrib/service/set/test_set_union_copy.c
similarity index 100%
rename from src/set/test_set_union_copy.c
rename to src/contrib/service/set/test_set_union_copy.c
diff --git a/src/set/test_set_union_result_symmetric.c 
b/src/contrib/service/set/test_set_union_result_symmetric.c
similarity index 100%
rename from src/set/test_set_union_result_symmetric.c
rename to src/contrib/service/set/test_set_union_result_symmetric.c
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 4fca1ee79..720d543ca 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -71,7 +71,7 @@ libgnunetconversation_la_SOURCES = \
 libgnunetconversation_la_LIBADD = \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -198,7 +198,7 @@ gnunet_conversation_LDADD = \
   libgnunetconversation.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(INTLLIBS)
@@ -223,7 +223,7 @@ test_conversation_api_LDADD = \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -237,7 +237,7 @@ test_conversation_api_twocalls_LDADD = \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -251,7 +251,7 @@ test_conversation_api_reject_LDADD = \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 379d6697a..08d85c903 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -186,7 +186,7 @@ test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ 
$(AM_CFLAGS)
 #  gnunet-gns-import.c
 #gnunet_gns_import_LDADD = \
 #  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-#  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+#  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
 #  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
 #  $(top_builddir)/src/lib/util/libgnunetutil.la \
 #  $(GN_LIBINTL)
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 2939d3379..62036f206 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS = \
        block \
        gnsrecord \
        dhtu \
-       namecache
+       namecache \
+       namestore
diff --git a/src/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
similarity index 81%
rename from src/namestore/Makefile.am
rename to src/plugin/namestore/Makefile.am
index 685829cc2..3c8e9d170 100644
--- a/src/namestore/Makefile.am
+++ b/src/plugin/namestore/Makefile.am
@@ -13,9 +13,6 @@ sql_DATA = \
   namestore-0001.sql \
   namestore-drop.sql
 
-pkgcfg_DATA = \
-   namestore.conf
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
   XLIBS = -lgcov
@@ -81,23 +78,6 @@ endif
 
 REST_PLUGIN = libgnunet_plugin_rest_namestore.la
 
-lib_LTLIBRARIES = \
-  libgnunetnamestore.la
-
-
-libexec_PROGRAMS = \
- gnunet-service-namestore
-
-bin_PROGRAMS = \
- gnunet-namestore \
- gnunet-namestore-dbtool \
- gnunet-namestore-zonefile \
- gnunet-zoneimport
-
-libexec_PROGRAMS += \
- gnunet-namestore-fcfsd
-
-
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
   $(POSTGRES_PLUGIN) \
@@ -107,7 +87,7 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_rest_namestore_la_SOURCES = \
   plugin_rest_namestore.c
 libgnunet_plugin_rest_namestore_la_LIBADD = \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/json/libgnunetjson.la \
@@ -120,82 +100,6 @@ libgnunet_plugin_rest_namestore_la_LDFLAGS = \
 libgnunet_plugin_rest_namestore_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 
 
-libgnunetnamestore_la_SOURCES = \
-  namestore_api.c \
-  namestore_api_monitor.c \
-  namestore.h
-libgnunetnamestore_la_LIBADD = \
-  $(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 \
-  $(GN_LIBINTL)
-libgnunetnamestore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:1:0
-
-gnunet_namestore_zonefile_SOURCES = \
- gnunet-namestore-zonefile.c
-gnunet_namestore_zonefile_LDADD = \
-  libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_zoneimport_SOURCES = \
- gnunet-zoneimport.c
-gnunet_zoneimport_LDADD = \
-  libgnunetnamestore.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_namestore_SOURCES = \
- gnunet-namestore.c
-gnunet_namestore_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-gnunet_namestore_dbtool_SOURCES = \
- gnunet-namestore-dbtool.c
-gnunet_namestore_dbtool_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-
-
-gnunet_namestore_fcfsd_SOURCES = \
- gnunet-namestore-fcfsd.c
-gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(GN_LIBINTL) -ljansson
-gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-gnunet_service_namestore_SOURCES = \
- gnunet-service-namestore.c
-gnunet_service_namestore_LDADD = \
-  $(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 \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-
-
 libgnunet_plugin_namestore_sqlite_la_SOURCES = \
   plugin_namestore_sqlite.c
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
@@ -227,7 +131,7 @@ test_namestore_api_store_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_store_postgres_SOURCES = \
  test_namestore_api_store.c
@@ -236,7 +140,7 @@ test_namestore_api_store_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_store_update_sqlite_SOURCES = \
  test_namestore_api_store_update.c
@@ -246,7 +150,7 @@ test_namestore_api_store_update_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_store_update_postgres_SOURCES = \
  test_namestore_api_store_update.c
@@ -256,7 +160,7 @@ test_namestore_api_store_update_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_sqlite_SOURCES = \
  test_namestore_api_lookup_nick.c
@@ -266,7 +170,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_postgres_SOURCES = \
  test_namestore_api_lookup_nick.c
@@ -276,7 +180,7 @@ test_namestore_api_lookup_nick_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_sqlite_SOURCES = \
  test_namestore_api_remove.c
@@ -285,7 +189,7 @@ test_namestore_api_remove_sqlite_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_postgres_SOURCES = \
  test_namestore_api_remove.c
@@ -294,7 +198,7 @@ test_namestore_api_remove_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
@@ -303,7 +207,7 @@ test_namestore_api_remove_not_existing_record_sqlite_LDADD 
= \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
@@ -312,7 +216,7 @@ 
test_namestore_api_remove_not_existing_record_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_to_name_sqlite_SOURCES = \
  test_namestore_api_zone_to_name.c
@@ -320,7 +224,7 @@ test_namestore_api_zone_to_name_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_to_name_postgres_SOURCES = \
  test_namestore_api_zone_to_name.c
@@ -328,14 +232,14 @@ test_namestore_api_zone_to_name_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_monitoring_sqlite_SOURCES = \
  test_namestore_api_monitoring.c
 test_namestore_api_monitoring_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -344,7 +248,7 @@ test_namestore_api_monitoring_postgres_SOURCES = \
 test_namestore_api_monitoring_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -353,7 +257,7 @@ test_namestore_api_monitoring_existing_sqlite_SOURCES = \
 test_namestore_api_monitoring_existing_sqlite_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -361,7 +265,7 @@ test_namestore_api_monitoring_existing_postgres_SOURCES = \
  test_namestore_api_monitoring_existing.c
 test_namestore_api_monitoring_existing_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -371,7 +275,7 @@ test_namestore_api_tx_rollback_sqlite_SOURCES = \
 test_namestore_api_tx_rollback_sqlite_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -380,7 +284,7 @@ test_namestore_api_tx_rollback_postgres_SOURCES = \
 test_namestore_api_tx_rollback_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -390,7 +294,7 @@ test_namestore_api_edit_records_postgres_SOURCES = \
 test_namestore_api_edit_records_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 endif
@@ -402,7 +306,7 @@ test_namestore_api_zone_iteration_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_postgres_SOURCES = \
  test_namestore_api_zone_iteration.c
@@ -411,7 +315,7 @@ test_namestore_api_zone_iteration_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 perf_namestore_api_zone_iteration_postgres_SOURCES = \
  perf_namestore_api_zone_iteration.c
@@ -420,7 +324,7 @@ perf_namestore_api_zone_iteration_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 perf_namestore_api_import_sqlite_SOURCES = \
  perf_namestore_api_import.c
@@ -429,7 +333,7 @@ perf_namestore_api_import_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 perf_namestore_api_import_postgres_SOURCES = \
  perf_namestore_api_import.c
@@ -438,7 +342,7 @@ perf_namestore_api_import_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 
 perf_namestore_api_zone_iteration_sqlite_SOURCES = \
@@ -448,7 +352,7 @@ perf_namestore_api_zone_iteration_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
@@ -457,7 +361,7 @@ test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
@@ -466,7 +370,7 @@ test_namestore_api_zone_iteration_nick_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_specific_zone.c
@@ -475,7 +379,7 @@ 
test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
  test_namestore_api_zone_iteration_specific_zone.c
@@ -484,7 +388,7 @@ 
test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
@@ -493,7 +397,7 @@ test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
@@ -502,7 +406,7 @@ test_namestore_api_zone_iteration_stop_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c
@@ -519,13 +423,6 @@ test_plugin_namestore_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 check_SCRIPTS = \
-  test_namestore_put.sh \
-  test_namestore_put_stdin.sh \
-  test_namestore_lookup.sh \
-  test_namestore_delete.sh \
-  test_namestore_zonefile_import.sh
-
-check_SCRIPTS += \
   test_plugin_rest_namestore.sh
 
 EXTRA_DIST = \
@@ -538,6 +435,5 @@ EXTRA_DIST = \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
   test_hostkey \
-  example_zonefile \
   $(check_SCRIPTS) \
   $(sql_DATA)
diff --git a/src/namestore/namestore-0001.sql 
b/src/plugin/namestore/namestore-0001.sql
similarity index 100%
rename from src/namestore/namestore-0001.sql
rename to src/plugin/namestore/namestore-0001.sql
diff --git a/src/namestore/namestore-drop.sql 
b/src/plugin/namestore/namestore-drop.sql
similarity index 100%
rename from src/namestore/namestore-drop.sql
rename to src/plugin/namestore/namestore-drop.sql
diff --git a/src/namestore/perf_namestore_api_import.c 
b/src/plugin/namestore/perf_namestore_api_import.c
similarity index 100%
rename from src/namestore/perf_namestore_api_import.c
rename to src/plugin/namestore/perf_namestore_api_import.c
diff --git a/src/namestore/perf_namestore_api_postgres.conf 
b/src/plugin/namestore/perf_namestore_api_postgres.conf
similarity index 100%
rename from src/namestore/perf_namestore_api_postgres.conf
rename to src/plugin/namestore/perf_namestore_api_postgres.conf
diff --git a/src/namestore/perf_namestore_api_sqlite.conf 
b/src/plugin/namestore/perf_namestore_api_sqlite.conf
similarity index 100%
rename from src/namestore/perf_namestore_api_sqlite.conf
rename to src/plugin/namestore/perf_namestore_api_sqlite.conf
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c 
b/src/plugin/namestore/perf_namestore_api_zone_iteration.c
similarity index 100%
rename from src/namestore/perf_namestore_api_zone_iteration.c
rename to src/plugin/namestore/perf_namestore_api_zone_iteration.c
diff --git a/src/namestore/plugin_namestore_flat.c 
b/src/plugin/namestore/plugin_namestore_flat.c
similarity index 99%
rename from src/namestore/plugin_namestore_flat.c
rename to src/plugin/namestore/plugin_namestore_flat.c
index 8b574d2cf..716071ff3 100644
--- a/src/namestore/plugin_namestore_flat.c
+++ b/src/plugin/namestore/plugin_namestore_flat.c
@@ -28,7 +28,6 @@
 #include "gnunet_namestore_plugin.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "namestore.h"
 
 /**
  * Context for all functions in this plugin.
diff --git a/src/namestore/plugin_namestore_postgres.c 
b/src/plugin/namestore/plugin_namestore_postgres.c
similarity index 99%
rename from src/namestore/plugin_namestore_postgres.c
rename to src/plugin/namestore/plugin_namestore_postgres.c
index c6debf3a9..1dc526dc2 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/plugin/namestore/plugin_namestore_postgres.c
@@ -28,7 +28,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_pq_lib.h"
-#include "namestore.h"
 
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "namestore-postgres", 
__VA_ARGS__)
diff --git a/src/namestore/plugin_namestore_sqlite.c 
b/src/plugin/namestore/plugin_namestore_sqlite.c
similarity index 99%
rename from src/namestore/plugin_namestore_sqlite.c
rename to src/plugin/namestore/plugin_namestore_sqlite.c
index d66271ffa..ada9ca25b 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/plugin/namestore/plugin_namestore_sqlite.c
@@ -29,7 +29,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_sq_lib.h"
-#include "namestore.h"
 #include <sqlite3.h>
 
 /**
diff --git a/src/namestore/plugin_rest_namestore.c 
b/src/plugin/namestore/plugin_rest_namestore.c
similarity index 100%
rename from src/namestore/plugin_rest_namestore.c
rename to src/plugin/namestore/plugin_rest_namestore.c
diff --git a/src/namestore/test_common.c b/src/plugin/namestore/test_common.c
similarity index 100%
rename from src/namestore/test_common.c
rename to src/plugin/namestore/test_common.c
diff --git a/src/namestore/test_hostkey b/src/plugin/namestore/test_hostkey
similarity index 100%
rename from src/namestore/test_hostkey
rename to src/plugin/namestore/test_hostkey
diff --git a/src/namestore/test_namestore_api.conf 
b/src/plugin/namestore/test_namestore_api.conf
similarity index 100%
rename from src/namestore/test_namestore_api.conf
rename to src/plugin/namestore/test_namestore_api.conf
diff --git a/src/namestore/test_namestore_api_edit_records.c 
b/src/plugin/namestore/test_namestore_api_edit_records.c
similarity index 100%
rename from src/namestore/test_namestore_api_edit_records.c
rename to src/plugin/namestore/test_namestore_api_edit_records.c
diff --git a/src/namestore/test_namestore_api_lookup_nick.c 
b/src/plugin/namestore/test_namestore_api_lookup_nick.c
similarity index 100%
rename from src/namestore/test_namestore_api_lookup_nick.c
rename to src/plugin/namestore/test_namestore_api_lookup_nick.c
diff --git a/src/namestore/test_namestore_api_monitoring.c 
b/src/plugin/namestore/test_namestore_api_monitoring.c
similarity index 100%
rename from src/namestore/test_namestore_api_monitoring.c
rename to src/plugin/namestore/test_namestore_api_monitoring.c
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c 
b/src/plugin/namestore/test_namestore_api_monitoring_existing.c
similarity index 100%
rename from src/namestore/test_namestore_api_monitoring_existing.c
rename to src/plugin/namestore/test_namestore_api_monitoring_existing.c
diff --git a/src/namestore/test_namestore_api_postgres.conf 
b/src/plugin/namestore/test_namestore_api_postgres.conf
similarity index 100%
rename from src/namestore/test_namestore_api_postgres.conf
rename to src/plugin/namestore/test_namestore_api_postgres.conf
diff --git a/src/namestore/test_namestore_api_remove.c 
b/src/plugin/namestore/test_namestore_api_remove.c
similarity index 100%
rename from src/namestore/test_namestore_api_remove.c
rename to src/plugin/namestore/test_namestore_api_remove.c
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c 
b/src/plugin/namestore/test_namestore_api_remove_not_existing_record.c
similarity index 100%
rename from src/namestore/test_namestore_api_remove_not_existing_record.c
rename to src/plugin/namestore/test_namestore_api_remove_not_existing_record.c
diff --git a/src/namestore/test_namestore_api_sqlite.conf 
b/src/plugin/namestore/test_namestore_api_sqlite.conf
similarity index 100%
rename from src/namestore/test_namestore_api_sqlite.conf
rename to src/plugin/namestore/test_namestore_api_sqlite.conf
diff --git a/src/namestore/test_namestore_api_store.c 
b/src/plugin/namestore/test_namestore_api_store.c
similarity index 100%
rename from src/namestore/test_namestore_api_store.c
rename to src/plugin/namestore/test_namestore_api_store.c
diff --git a/src/namestore/test_namestore_api_store_update.c 
b/src/plugin/namestore/test_namestore_api_store_update.c
similarity index 100%
rename from src/namestore/test_namestore_api_store_update.c
rename to src/plugin/namestore/test_namestore_api_store_update.c
diff --git a/src/namestore/test_namestore_api_tx_rollback.c 
b/src/plugin/namestore/test_namestore_api_tx_rollback.c
similarity index 100%
rename from src/namestore/test_namestore_api_tx_rollback.c
rename to src/plugin/namestore/test_namestore_api_tx_rollback.c
diff --git a/src/namestore/test_namestore_api_zone_iteration.c 
b/src/plugin/namestore/test_namestore_api_zone_iteration.c
similarity index 100%
rename from src/namestore/test_namestore_api_zone_iteration.c
rename to src/plugin/namestore/test_namestore_api_zone_iteration.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c 
b/src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
similarity index 100%
rename from src/namestore/test_namestore_api_zone_iteration_nick.c
rename to src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c 
b/src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
similarity index 100%
rename from src/namestore/test_namestore_api_zone_iteration_specific_zone.c
rename to src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c 
b/src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
similarity index 100%
rename from src/namestore/test_namestore_api_zone_iteration_stop.c
rename to src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
diff --git a/src/namestore/test_namestore_api_zone_to_name.c 
b/src/plugin/namestore/test_namestore_api_zone_to_name.c
similarity index 100%
rename from src/namestore/test_namestore_api_zone_to_name.c
rename to src/plugin/namestore/test_namestore_api_zone_to_name.c
diff --git a/src/namestore/test_plugin_namestore.c 
b/src/plugin/namestore/test_plugin_namestore.c
similarity index 100%
rename from src/namestore/test_plugin_namestore.c
rename to src/plugin/namestore/test_plugin_namestore.c
diff --git a/src/namestore/test_plugin_namestore_postgres.conf 
b/src/plugin/namestore/test_plugin_namestore_postgres.conf
similarity index 100%
rename from src/namestore/test_plugin_namestore_postgres.conf
rename to src/plugin/namestore/test_plugin_namestore_postgres.conf
diff --git a/src/namestore/test_plugin_namestore_sqlite.conf 
b/src/plugin/namestore/test_plugin_namestore_sqlite.conf
similarity index 100%
rename from src/namestore/test_plugin_namestore_sqlite.conf
rename to src/plugin/namestore/test_plugin_namestore_sqlite.conf
diff --git a/src/namestore/test_plugin_rest_namestore.sh 
b/src/plugin/namestore/test_plugin_rest_namestore.sh
similarity index 100%
rename from src/namestore/test_plugin_rest_namestore.sh
rename to src/plugin/namestore/test_plugin_rest_namestore.sh
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 567cbb6d7..5ecaaa10c 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -53,7 +53,7 @@ EXTRA_DIST = \
 test_gns_vpn_SOURCES = \
  test_gns_vpn.c
 test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/service/identity/libgnunetidentity.la \
  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index c052dd2a8..406aad081 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -63,7 +63,7 @@ libgnunet_plugin_rest_reclaim_la_LIBADD = \
   $(top_builddir)/src/lib/json/libgnunetjson.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson $(MHD_LIBS)
 libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
@@ -79,7 +79,7 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   libgnunetreclaim.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
@@ -123,7 +123,7 @@ gnunet_service_reclaim_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/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
  libgnunetreclaim.la \
  $(top_builddir)/src/gns/libgnunetgns.la \
@@ -154,7 +154,7 @@ libgnunetdid_la_LIBADD = \
        $(top_builddir)/src/gns/libgnunetgns.la \
        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
        $(top_builddir)/src/service/identity/libgnunetidentity.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
+       $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
        -ljansson \
   $(GN_LIBINTL) $(XLIB)
 libgnunetdid_la_LDFLAGS = \
@@ -200,7 +200,7 @@ gnunet_reclaim_SOURCES = \
  gnunet-reclaim.c
 gnunet_reclaim_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   libgnunetreclaim.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(GN_LIBINTL)
@@ -219,7 +219,7 @@ gnunet_did_LDADD = \
        $(top_builddir)/src/gns/libgnunetgns.la \
        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
        $(top_builddir)/src/service/identity/libgnunetidentity.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
+       $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   libgnunetdid.la \
        -ljansson
 
@@ -231,7 +231,7 @@ test_did_helper_LDADD = \
        $(top_builddir)/src/gns/libgnunetgns.la \
        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
        $(top_builddir)/src/service/identity/libgnunetidentity.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
+       $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   libgnunetdid.la \
   -ljansson
 
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 02148d0c7..636caa985 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -18,5 +18,6 @@ SUBDIRS = \
        datastore \
        dht \
   namecache \
+  namestore \
   regex \
        cadet
diff --git a/src/namestore/.gitignore b/src/service/namestore/.gitignore
similarity index 96%
rename from src/namestore/.gitignore
rename to src/service/namestore/.gitignore
index 2265f9815..7b99c6163 100644
--- a/src/namestore/.gitignore
+++ b/src/service/namestore/.gitignore
@@ -1,7 +1,4 @@
 gnunet-service-namestore
-gnunet-namestore
-gnunet-namestore-dbtool
-gnunet-namestore-zonefile
 gnunet-namestore-fcfsd
 test_namestore_api_lookup_nick.nc
 test_namestore_api_lookup_private.nc
@@ -20,7 +17,6 @@ test_namestore_api_zone_iteration_specific_zone.nc
 test_namestore_api_zone_iteration_stop.nc
 test_plugin_namestore_postgres
 test_plugin_namestore_sqlite
-gnunet-zoneimport
 test_namestore_api_lookup_nick_postgres
 test_namestore_api_lookup_nick_sqlite
 test_namestore_api_lookup_private_postgres
diff --git a/src/service/namestore/Makefile.am 
b/src/service/namestore/Makefile.am
new file mode 100644
index 000000000..7f49e680f
--- /dev/null
+++ b/src/service/namestore/Makefile.am
@@ -0,0 +1,63 @@
+# 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 = \
+   namestore.conf
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+lib_LTLIBRARIES = \
+  libgnunetnamestore.la
+
+libexec_PROGRAMS = \
+ gnunet-service-namestore
+
+libexec_PROGRAMS += \
+ gnunet-namestore-fcfsd
+
+
+libgnunetnamestore_la_SOURCES = \
+  namestore_api.c \
+  namestore_api_monitor.c \
+  namestore.h
+libgnunetnamestore_la_LIBADD = \
+  $(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 \
+  $(GN_LIBINTL)
+libgnunetnamestore_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  \
+  -version-info 0:1:0
+
+gnunet_namestore_fcfsd_SOURCES = \
+ gnunet-namestore-fcfsd.c
+gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  libgnunetnamestore.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
+  $(GN_LIBINTL) -ljansson
+gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+
+
+gnunet_service_namestore_SOURCES = \
+ gnunet-service-namestore.c
+gnunet_service_namestore_LDADD = \
+  $(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 \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  libgnunetnamestore.la \
+  $(GN_LIBINTL)
diff --git a/src/namestore/gnunet-namestore-fcfsd.c 
b/src/service/namestore/gnunet-namestore-fcfsd.c
similarity index 100%
rename from src/namestore/gnunet-namestore-fcfsd.c
rename to src/service/namestore/gnunet-namestore-fcfsd.c
diff --git a/src/namestore/gnunet-service-namestore.c 
b/src/service/namestore/gnunet-service-namestore.c
similarity index 100%
rename from src/namestore/gnunet-service-namestore.c
rename to src/service/namestore/gnunet-service-namestore.c
diff --git a/src/namestore/meson.build b/src/service/namestore/meson.build
similarity index 100%
rename from src/namestore/meson.build
rename to src/service/namestore/meson.build
diff --git a/src/namestore/namestore.conf.in 
b/src/service/namestore/namestore.conf.in
similarity index 100%
rename from src/namestore/namestore.conf.in
rename to src/service/namestore/namestore.conf.in
diff --git a/src/namestore/namestore.h b/src/service/namestore/namestore.h
similarity index 100%
rename from src/namestore/namestore.h
rename to src/service/namestore/namestore.h
diff --git a/src/namestore/namestore_api.c 
b/src/service/namestore/namestore_api.c
similarity index 100%
rename from src/namestore/namestore_api.c
rename to src/service/namestore/namestore_api.c
diff --git a/src/namestore/namestore_api_monitor.c 
b/src/service/namestore/namestore_api_monitor.c
similarity index 100%
rename from src/namestore/namestore_api_monitor.c
rename to src/service/namestore/namestore_api_monitor.c
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index 8f4e74588..5a96afa83 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -26,7 +26,7 @@ gnunet_service_zonemaster_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la  \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(GN_LIBINTL) \
   -lpthread

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]