54 files changed, 29 insertions, 29 deletions

diff --git a/configure.ac b/configure.ac
index d4a84a989..5df94e8e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1303,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
@@ -1323,12 +1327,8 @@ src/include/gnunet_config.h
 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 be60d2b50..05bc968e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,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
@@ -41,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
@@ -52,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
@@ -308,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
@@ -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
diff --git a/src/Makefile.am b/src/Makefile.am
index 208049b50..0cafaf276 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,10 +17,8 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  set \
   seti \
   setu \
-  consensus \
   scalarproduct \
   revocation \
   vpn \
@@ -30,6 +28,5 @@ SUBDIRS = \
   fs \
   exit \
   pt \
-  secretsharing \
   reclaim \
   messenger
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/consensus/.gitignore b/src/contrib/service/consensus/.gitignore
index 8050d760e..8050d760e 100644
--- a/src/consensus/.gitignore
+++ b/src/contrib/service/consensus/.gitignore
diff --git a/src/consensus/Makefile.am b/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
index 272a52da2..272a52da2 100644
--- a/src/consensus/consensus-simulation.py.in
+++ b/src/contrib/service/consensus/consensus-simulation.py.in
diff --git a/src/consensus/consensus.conf.in b/src/contrib/service/consensus/consensus.conf.in
index b0fbcaf5a..b0fbcaf5a 100644
--- a/src/consensus/consensus.conf.in
+++ b/src/contrib/service/consensus/consensus.conf.in
diff --git a/src/consensus/consensus.h b/src/contrib/service/consensus/consensus.h
index 888213d55..888213d55 100644
--- a/src/consensus/consensus.h
+++ b/src/contrib/service/consensus/consensus.h
diff --git a/src/consensus/consensus_api.c b/src/contrib/service/consensus/consensus_api.c
index 01d0ad3de..01d0ad3de 100644
--- a/src/consensus/consensus_api.c
+++ b/src/contrib/service/consensus/consensus_api.c
diff --git a/src/consensus/consensus_protocol.h b/src/contrib/service/consensus/consensus_protocol.h
index 0afd56b27..0afd56b27 100644
--- a/src/consensus/consensus_protocol.h
+++ b/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
index 5b6b9bbd7..5b6b9bbd7 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/contrib/service/consensus/gnunet-service-consensus.c
diff --git a/src/consensus/meson.build b/src/contrib/service/consensus/meson.build
index b66acf2b9..b66acf2b9 100644
--- a/src/consensus/meson.build
+++ b/src/contrib/service/consensus/meson.build
diff --git a/src/consensus/plugin_block_consensus.c b/src/contrib/service/consensus/plugin_block_consensus.c
index 241d8fc7b..241d8fc7b 100644
--- a/src/consensus/plugin_block_consensus.c
+++ b/src/contrib/service/consensus/plugin_block_consensus.c
diff --git a/src/consensus/test_consensus.conf b/src/contrib/service/consensus/test_consensus.conf
index df7fb6861..df7fb6861 100644
--- a/src/consensus/test_consensus.conf
+++ b/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
index 235a67484..235a67484 100644
--- a/src/consensus/test_consensus_api.c
+++ b/src/contrib/service/consensus/test_consensus_api.c
diff --git a/src/secretsharing/.gitignore b/src/contrib/service/secretsharing/.gitignore
index fe9db53a4..fe9db53a4 100644
--- a/src/secretsharing/.gitignore
+++ b/src/contrib/service/secretsharing/.gitignore
diff --git a/src/secretsharing/Makefile.am b/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
index 432d6da89..432d6da89 100644
--- a/src/secretsharing/gnunet-secretsharing-profiler.c
+++ b/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
index 84338bd11..84338bd11 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/contrib/service/secretsharing/gnunet-service-secretsharing.c
diff --git a/src/secretsharing/meson.build b/src/contrib/service/secretsharing/meson.build
index bfd66dddb..bfd66dddb 100644
--- a/src/secretsharing/meson.build
+++ b/src/contrib/service/secretsharing/meson.build
diff --git a/src/secretsharing/secretsharing.conf.in b/src/contrib/service/secretsharing/secretsharing.conf.in
index df8566abd..df8566abd 100644
--- a/src/secretsharing/secretsharing.conf.in
+++ b/src/contrib/service/secretsharing/secretsharing.conf.in
diff --git a/src/secretsharing/secretsharing.h b/src/contrib/service/secretsharing/secretsharing.h
index 6e104ebfa..6e104ebfa 100644
--- a/src/secretsharing/secretsharing.h
+++ b/src/contrib/service/secretsharing/secretsharing.h
diff --git a/src/secretsharing/secretsharing_api.c b/src/contrib/service/secretsharing/secretsharing_api.c
index 595af751f..595af751f 100644
--- a/src/secretsharing/secretsharing_api.c
+++ b/src/contrib/service/secretsharing/secretsharing_api.c
diff --git a/src/secretsharing/secretsharing_common.c b/src/contrib/service/secretsharing/secretsharing_common.c
index 44b96b1c8..44b96b1c8 100644
--- a/src/secretsharing/secretsharing_common.c
+++ b/src/contrib/service/secretsharing/secretsharing_common.c
diff --git a/src/secretsharing/secretsharing_protocol.h b/src/contrib/service/secretsharing/secretsharing_protocol.h
index e6f3ba286..e6f3ba286 100644
--- a/src/secretsharing/secretsharing_protocol.h
+++ b/src/contrib/service/secretsharing/secretsharing_protocol.h
diff --git a/src/secretsharing/test_secretsharing.conf b/src/contrib/service/secretsharing/test_secretsharing.conf
index 9cbe3ebb1..9cbe3ebb1 100644
--- a/src/secretsharing/test_secretsharing.conf
+++ b/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
index 470bfddf4..470bfddf4 100644
--- a/src/secretsharing/test_secretsharing_api.c
+++ b/src/contrib/service/secretsharing/test_secretsharing_api.c
diff --git a/src/set/.gitignore b/src/contrib/service/set/.gitignore
index f1c958639..f1c958639 100644
--- a/src/set/.gitignore
+++ b/src/contrib/service/set/.gitignore
diff --git a/src/set/Makefile.am b/src/contrib/service/set/Makefile.am
index 88d4d39ad..88d4d39ad 100644
--- a/src/set/Makefile.am
+++ b/src/contrib/service/set/Makefile.am
diff --git a/src/set/gnunet-service-set.c b/src/contrib/service/set/gnunet-service-set.c
index 7c522ec34..7c522ec34 100644
--- a/src/set/gnunet-service-set.c
+++ b/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
index abdec7f08..abdec7f08 100644
--- a/src/set/gnunet-service-set.h
+++ b/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
index 51a8d0dbc..51a8d0dbc 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/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
index d8884d0a7..d8884d0a7 100644
--- a/src/set/gnunet-service-set_intersection.h
+++ b/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
index a2803ee47..a2803ee47 100644
--- a/src/set/gnunet-service-set_protocol.h
+++ b/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
index 3a2bc8bd7..3a2bc8bd7 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/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
index 68301c96b..68301c96b 100644
--- a/src/set/gnunet-service-set_union.h
+++ b/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
index 6de9fb5eb..6de9fb5eb 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/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
index 94267a2dc..94267a2dc 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.h
+++ b/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
index 6465b15b8..6465b15b8 100644
--- a/src/set/gnunet-set-ibf-profiler.c
+++ b/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
index 3014861a6..3014861a6 100644
--- a/src/set/gnunet-set-profiler.c
+++ b/src/contrib/service/set/gnunet-set-profiler.c
diff --git a/src/set/ibf.c b/src/contrib/service/set/ibf.c
index b6fb52b6b..b6fb52b6b 100644
--- a/src/set/ibf.c
+++ b/src/contrib/service/set/ibf.c
diff --git a/src/set/ibf.h b/src/contrib/service/set/ibf.h
index 334a797ef..334a797ef 100644
--- a/src/set/ibf.h
+++ b/src/contrib/service/set/ibf.h
diff --git a/src/set/ibf_sim.c b/src/contrib/service/set/ibf_sim.c
index 563ed0fb8..563ed0fb8 100644
--- a/src/set/ibf_sim.c
+++ b/src/contrib/service/set/ibf_sim.c
diff --git a/src/set/meson.build b/src/contrib/service/set/meson.build
index fe4934cb9..fe4934cb9 100644
--- a/src/set/meson.build
+++ b/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
index cb5cef5ad..cb5cef5ad 100644
--- a/src/set/plugin_block_set_test.c
+++ b/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
index 66bcfa169..66bcfa169 100644
--- a/src/set/set.conf.in
+++ b/src/contrib/service/set/set.conf.in
diff --git a/src/set/set.h b/src/contrib/service/set/set.h
index e9d10ea22..e9d10ea22 100644
--- a/src/set/set.h
+++ b/src/contrib/service/set/set.h
diff --git a/src/set/set_api.c b/src/contrib/service/set/set_api.c
index 4f73ff06c..4f73ff06c 100644
--- a/src/set/set_api.c
+++ b/src/contrib/service/set/set_api.c
diff --git a/src/set/test_set.conf b/src/contrib/service/set/test_set.conf
index f9b4547e9..f9b4547e9 100644
--- a/src/set/test_set.conf
+++ b/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
index d1afdd354..d1afdd354 100644
--- a/src/set/test_set_api.c
+++ b/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
index 42dedb846..42dedb846 100644
--- a/src/set/test_set_intersection_result_full.c
+++ b/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
index 908527017..908527017 100644
--- a/src/set/test_set_union_copy.c
+++ b/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
index b6c7a82f6..b6c7a82f6 100644
--- a/src/set/test_set_union_result_symmetric.c
+++ b/src/contrib/service/set/test_set_union_result_symmetric.c