71 files changed, 43 insertions, 35 deletions

diff --git a/configure.ac b/configure.ac
index 48a33c6c1..d977b94e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1228,7 +1228,6 @@ doc/doxygen/Makefile
 m4/Makefile
 po/Makefile.in
 src/Makefile
-src/auction/Makefile
 src/lib/Makefile
 src/lib/util/Makefile
 src/lib/util/resolver.conf
@@ -1253,6 +1252,13 @@ src/cli/Makefile
 src/cli/arm/Makefile
 src/cli/core/Makefile
 src/cli/util/Makefile
+src/contrib/Makefile
+src/contrib/service/Makefile
+src/contrib/service/abd/Makefile
+src/contrib/service/abd/abd.conf
+src/contrib/service/auction/Makefile
+src/contrib/service/rps/Makefile
+src/contrib/service/rps/rps.conf
 src/cadet/Makefile
 src/cadet/cadet.conf
 src/consensus/Makefile
@@ -1295,8 +1301,6 @@ src/regex/Makefile
 src/regex/regex.conf
 src/revocation/Makefile
 src/revocation/revocation.conf
-src/rps/Makefile
-src/rps/rps.conf
 src/secretsharing/Makefile
 src/secretsharing/secretsharing.conf
 src/scalarproduct/Makefile
@@ -1318,8 +1322,6 @@ src/vpn/vpn.conf
 src/zonemaster/Makefile
 src/zonemaster/zonemaster.conf
 src/rest/Makefile
-src/abd/Makefile
-src/abd/abd.conf
 src/reclaim/Makefile
 src/messenger/Makefile
 src/messenger/messenger.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9807a8e2e..72036df8c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,13 +1,3 @@
-src/abd/abd_api.c
-src/abd/abd_serialization.c
-src/abd/delegate_misc.c
-src/abd/gnunet-abd.c
-src/abd/gnunet-service-abd.c
-src/abd/plugin_gnsrecord_abd.c
-src/auction/gnunet-auction-create.c
-src/auction/gnunet-auction-info.c
-src/auction/gnunet-auction-join.c
-src/auction/gnunet-service-auction.c
 src/cadet/cadet_api.c
 src/cadet/cadet_api_drop_message.c
 src/cadet/cadet_api_get_channel.c
@@ -42,6 +32,27 @@ 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/service/abd/abd_api.c
+src/contrib/service/abd/abd_serialization.c
+src/contrib/service/abd/delegate_misc.c
+src/contrib/service/abd/gnunet-abd.c
+src/contrib/service/abd/gnunet-service-abd.c
+src/contrib/service/abd/plugin_gnsrecord_abd.c
+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/rps/gnunet-rps-profiler.c
+src/contrib/service/rps/gnunet-rps.c
+src/contrib/service/rps/gnunet-service-rps.c
+src/contrib/service/rps/gnunet-service-rps_custommap.c
+src/contrib/service/rps/gnunet-service-rps_sampler.c
+src/contrib/service/rps/gnunet-service-rps_sampler_elem.c
+src/contrib/service/rps/gnunet-service-rps_view.c
+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/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
 src/conversation/gnunet-conversation-test.c
@@ -406,17 +417,6 @@ src/revocation/gnunet-revocation.c
 src/revocation/gnunet-service-revocation.c
 src/revocation/plugin_block_revocation.c
 src/revocation/revocation_api.c
-src/rps/gnunet-rps-profiler.c
-src/rps/gnunet-rps.c
-src/rps/gnunet-service-rps.c
-src/rps/gnunet-service-rps_custommap.c
-src/rps/gnunet-service-rps_sampler.c
-src/rps/gnunet-service-rps_sampler_elem.c
-src/rps/gnunet-service-rps_view.c
-src/rps/rps-sampler_client.c
-src/rps/rps-sampler_common.c
-src/rps/rps-test_util.c
-src/rps/rps_api.c
 src/scalarproduct/gnunet-scalarproduct.c
 src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
 src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 2ac40e4cb..cf40834b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,5 @@
 # This Makefile.am is in the public domain
 
-if HAVE_EXPERIMENTAL
- EXP_DIR = \
-  rps \
-  abd \
-  auction
-endif
 
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
@@ -15,7 +9,6 @@ CONVERSATION_DIR = conversation
 endif
 endif
 
-
 REST_DIR = rest
 
 
@@ -25,6 +18,7 @@ SUBDIRS = \
         plugin \
         service \
         cli \
+        contrib \
   statistics \
   $(REST_DIR) \
   datacache \
@@ -59,5 +53,4 @@ SUBDIRS = \
   pt \
   secretsharing \
   reclaim \
-  messenger \
-  $(EXP_DIR)
+  messenger
diff --git a/src/contrib/Makefile.am b/src/contrib/Makefile.am
new file mode 100644
index 000000000..516fb872c
--- /dev/null
+++ b/src/contrib/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS = \
+        #lib \
+        #plugin \
+        service
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
new file mode 100644
index 000000000..25c3670d9
--- /dev/null
+++ b/src/contrib/service/Makefile.am
@@ -0,0 +1,9 @@
+if HAVE_EXPERIMENTAL
+ EXP_DIR = \
+  rps \
+  abd \
+  auction
+endif
+
+SUBDIRS = \
+        $(EXP_DIR)
diff --git a/src/abd/.gitignore b/src/contrib/service/abd/.gitignore
index ee1eb7837..ee1eb7837 100644
--- a/src/abd/.gitignore
+++ b/src/contrib/service/abd/.gitignore
diff --git a/src/abd/Makefile.am b/src/contrib/service/abd/Makefile.am
index 6fa2dc848..6fa2dc848 100644
--- a/src/abd/Makefile.am
+++ b/src/contrib/service/abd/Makefile.am
diff --git a/src/abd/abd.conf.in b/src/contrib/service/abd/abd.conf.in
index 7baf95fc8..7baf95fc8 100644
--- a/src/abd/abd.conf.in
+++ b/src/contrib/service/abd/abd.conf.in
diff --git a/src/abd/abd.h b/src/contrib/service/abd/abd.h
index 26b8e222e..26b8e222e 100644
--- a/src/abd/abd.h
+++ b/src/contrib/service/abd/abd.h
diff --git a/src/abd/abd_api.c b/src/contrib/service/abd/abd_api.c
index 3682f41ba..3682f41ba 100644
--- a/src/abd/abd_api.c
+++ b/src/contrib/service/abd/abd_api.c
diff --git a/src/abd/abd_serialization.c b/src/contrib/service/abd/abd_serialization.c
index 14960e804..14960e804 100644
--- a/src/abd/abd_serialization.c
+++ b/src/contrib/service/abd/abd_serialization.c
diff --git a/src/abd/abd_serialization.h b/src/contrib/service/abd/abd_serialization.h
index 21dc45a7b..21dc45a7b 100644
--- a/src/abd/abd_serialization.h
+++ b/src/contrib/service/abd/abd_serialization.h
diff --git a/src/abd/delegate_misc.c b/src/contrib/service/abd/delegate_misc.c
index 446c0b8d2..446c0b8d2 100644
--- a/src/abd/delegate_misc.c
+++ b/src/contrib/service/abd/delegate_misc.c
diff --git a/src/abd/delegate_misc.h b/src/contrib/service/abd/delegate_misc.h
index 0a4ddd9eb..0a4ddd9eb 100644
--- a/src/abd/delegate_misc.h
+++ b/src/contrib/service/abd/delegate_misc.h
diff --git a/src/abd/gnunet-abd.c b/src/contrib/service/abd/gnunet-abd.c
index 1ed1adbe7..1ed1adbe7 100644
--- a/src/abd/gnunet-abd.c
+++ b/src/contrib/service/abd/gnunet-abd.c
diff --git a/src/abd/gnunet-service-abd.c b/src/contrib/service/abd/gnunet-service-abd.c
index 5cbc105f6..5cbc105f6 100644
--- a/src/abd/gnunet-service-abd.c
+++ b/src/contrib/service/abd/gnunet-service-abd.c
diff --git a/src/abd/plugin_gnsrecord_abd.c b/src/contrib/service/abd/plugin_gnsrecord_abd.c
index 43abe578f..43abe578f 100644
--- a/src/abd/plugin_gnsrecord_abd.c
+++ b/src/contrib/service/abd/plugin_gnsrecord_abd.c
diff --git a/src/abd/test_abd_bi_and.sh b/src/contrib/service/abd/test_abd_bi_and.sh
index 99c89a344..99c89a344 100755
--- a/src/abd/test_abd_bi_and.sh
+++ b/src/contrib/service/abd/test_abd_bi_and.sh
diff --git a/src/abd/test_abd_bi_and2.sh b/src/contrib/service/abd/test_abd_bi_and2.sh
index 8d1601ef4..8d1601ef4 100755
--- a/src/abd/test_abd_bi_and2.sh
+++ b/src/contrib/service/abd/test_abd_bi_and2.sh
diff --git a/src/abd/test_abd_bi_and3.sh b/src/contrib/service/abd/test_abd_bi_and3.sh
index cde2a020b..cde2a020b 100755
--- a/src/abd/test_abd_bi_and3.sh
+++ b/src/contrib/service/abd/test_abd_bi_and3.sh
diff --git a/src/abd/test_abd_bi_and4.sh b/src/contrib/service/abd/test_abd_bi_and4.sh
index e8cd6efd6..e8cd6efd6 100755
--- a/src/abd/test_abd_bi_and4.sh
+++ b/src/contrib/service/abd/test_abd_bi_and4.sh
diff --git a/src/abd/test_abd_bi_bw.sh b/src/contrib/service/abd/test_abd_bi_bw.sh
index 6b0e51722..6b0e51722 100755
--- a/src/abd/test_abd_bi_bw.sh
+++ b/src/contrib/service/abd/test_abd_bi_bw.sh
diff --git a/src/abd/test_abd_bi_bw_link.sh b/src/contrib/service/abd/test_abd_bi_bw_link.sh
index f60f78827..f60f78827 100755
--- a/src/abd/test_abd_bi_bw_link.sh
+++ b/src/contrib/service/abd/test_abd_bi_bw_link.sh
diff --git a/src/abd/test_abd_bi_bw_link2.sh b/src/contrib/service/abd/test_abd_bi_bw_link2.sh
index b0fb49b8e..b0fb49b8e 100755
--- a/src/abd/test_abd_bi_bw_link2.sh
+++ b/src/contrib/service/abd/test_abd_bi_bw_link2.sh
diff --git a/src/abd/test_abd_bi_fw.sh b/src/contrib/service/abd/test_abd_bi_fw.sh
index 75a940fbe..75a940fbe 100755
--- a/src/abd/test_abd_bi_fw.sh
+++ b/src/contrib/service/abd/test_abd_bi_fw.sh
diff --git a/src/abd/test_abd_defaults.conf b/src/contrib/service/abd/test_abd_defaults.conf
index 7b4cb576d..7b4cb576d 100644
--- a/src/abd/test_abd_defaults.conf
+++ b/src/contrib/service/abd/test_abd_defaults.conf
diff --git a/src/abd/test_abd_issue.sh b/src/contrib/service/abd/test_abd_issue.sh
index 8076aa921..8076aa921 100755
--- a/src/abd/test_abd_issue.sh
+++ b/src/contrib/service/abd/test_abd_issue.sh
diff --git a/src/abd/test_abd_lookup.conf b/src/contrib/service/abd/test_abd_lookup.conf
index 4072ba23b..4072ba23b 100644
--- a/src/abd/test_abd_lookup.conf
+++ b/src/contrib/service/abd/test_abd_lookup.conf
diff --git a/src/abd/test_abd_own.sh b/src/contrib/service/abd/test_abd_own.sh
index 3fc210284..3fc210284 100755
--- a/src/abd/test_abd_own.sh
+++ b/src/contrib/service/abd/test_abd_own.sh
diff --git a/src/abd/test_abd_verify.sh b/src/contrib/service/abd/test_abd_verify.sh
index 9ece91c62..9ece91c62 100755
--- a/src/abd/test_abd_verify.sh
+++ b/src/contrib/service/abd/test_abd_verify.sh
diff --git a/src/abd/test_abd_verify_and.sh b/src/contrib/service/abd/test_abd_verify_and.sh
index c6287055e..c6287055e 100755
--- a/src/abd/test_abd_verify_and.sh
+++ b/src/contrib/service/abd/test_abd_verify_and.sh
diff --git a/src/abd/test_abd_verify_simple.sh b/src/contrib/service/abd/test_abd_verify_simple.sh
index e917f8793..e917f8793 100755
--- a/src/abd/test_abd_verify_simple.sh
+++ b/src/contrib/service/abd/test_abd_verify_simple.sh
diff --git a/src/auction/.gitignore b/src/contrib/service/auction/.gitignore
index 5c3ec20cb..5c3ec20cb 100644
--- a/src/auction/.gitignore
+++ b/src/contrib/service/auction/.gitignore
diff --git a/src/auction/Makefile.am b/src/contrib/service/auction/Makefile.am
index ec0ffaf33..ec0ffaf33 100644
--- a/src/auction/Makefile.am
+++ b/src/contrib/service/auction/Makefile.am
diff --git a/src/auction/auction.conf b/src/contrib/service/auction/auction.conf
index deb9ac1fc..deb9ac1fc 100644
--- a/src/auction/auction.conf
+++ b/src/contrib/service/auction/auction.conf
diff --git a/src/auction/auction.h b/src/contrib/service/auction/auction.h
index dc8b933f6..dc8b933f6 100644
--- a/src/auction/auction.h
+++ b/src/contrib/service/auction/auction.h
diff --git a/src/auction/gnunet-auction-create.c b/src/contrib/service/auction/gnunet-auction-create.c
index 93947b89c..93947b89c 100644
--- a/src/auction/gnunet-auction-create.c
+++ b/src/contrib/service/auction/gnunet-auction-create.c
diff --git a/src/auction/gnunet-auction-info.c b/src/contrib/service/auction/gnunet-auction-info.c
index dded45ce6..dded45ce6 100644
--- a/src/auction/gnunet-auction-info.c
+++ b/src/contrib/service/auction/gnunet-auction-info.c
diff --git a/src/auction/gnunet-auction-join.c b/src/contrib/service/auction/gnunet-auction-join.c
index dded45ce6..dded45ce6 100644
--- a/src/auction/gnunet-auction-join.c
+++ b/src/contrib/service/auction/gnunet-auction-join.c
diff --git a/src/auction/gnunet-service-auction.c b/src/contrib/service/auction/gnunet-service-auction.c
index c20f0bdbe..c20f0bdbe 100644
--- a/src/auction/gnunet-service-auction.c
+++ b/src/contrib/service/auction/gnunet-service-auction.c
diff --git a/src/auction/test_auction_api.c b/src/contrib/service/auction/test_auction_api.c
index 1eac9b5c4..1eac9b5c4 100644
--- a/src/auction/test_auction_api.c
+++ b/src/contrib/service/auction/test_auction_api.c
diff --git a/src/auction/test_auction_create.sh b/src/contrib/service/auction/test_auction_create.sh
index b0f4de738..b0f4de738 100755
--- a/src/auction/test_auction_create.sh
+++ b/src/contrib/service/auction/test_auction_create.sh
diff --git a/src/rps/.gitignore b/src/contrib/service/rps/.gitignore
index 9e78e2ca0..9e78e2ca0 100644
--- a/src/rps/.gitignore
+++ b/src/contrib/service/rps/.gitignore
diff --git a/src/rps/Makefile.am b/src/contrib/service/rps/Makefile.am
index 2ee315d11..2ee315d11 100644
--- a/src/rps/Makefile.am
+++ b/src/contrib/service/rps/Makefile.am
diff --git a/src/rps/gnunet-rps-profiler.c b/src/contrib/service/rps/gnunet-rps-profiler.c
index df10ad5da..df10ad5da 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/contrib/service/rps/gnunet-rps-profiler.c
diff --git a/src/rps/gnunet-rps.c b/src/contrib/service/rps/gnunet-rps.c
index f90fc0d88..f90fc0d88 100644
--- a/src/rps/gnunet-rps.c
+++ b/src/contrib/service/rps/gnunet-rps.c
diff --git a/src/rps/gnunet-service-rps.c b/src/contrib/service/rps/gnunet-service-rps.c
index 76e33c87b..76e33c87b 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/contrib/service/rps/gnunet-service-rps.c
diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/contrib/service/rps/gnunet-service-rps_custommap.c
index b1e73be17..b1e73be17 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/contrib/service/rps/gnunet-service-rps_custommap.c
diff --git a/src/rps/gnunet-service-rps_custommap.h b/src/contrib/service/rps/gnunet-service-rps_custommap.h
index e7f669c63..e7f669c63 100644
--- a/src/rps/gnunet-service-rps_custommap.h
+++ b/src/contrib/service/rps/gnunet-service-rps_custommap.h
diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/contrib/service/rps/gnunet-service-rps_sampler.c
index 598cc887e..598cc887e 100644
--- a/src/rps/gnunet-service-rps_sampler.c
+++ b/src/contrib/service/rps/gnunet-service-rps_sampler.c
diff --git a/src/rps/gnunet-service-rps_sampler.h b/src/contrib/service/rps/gnunet-service-rps_sampler.h
index 410823bea..410823bea 100644
--- a/src/rps/gnunet-service-rps_sampler.h
+++ b/src/contrib/service/rps/gnunet-service-rps_sampler.h
diff --git a/src/rps/gnunet-service-rps_sampler_elem.c b/src/contrib/service/rps/gnunet-service-rps_sampler_elem.c
index a6dc755a3..a6dc755a3 100644
--- a/src/rps/gnunet-service-rps_sampler_elem.c
+++ b/src/contrib/service/rps/gnunet-service-rps_sampler_elem.c
diff --git a/src/rps/gnunet-service-rps_sampler_elem.h b/src/contrib/service/rps/gnunet-service-rps_sampler_elem.h
index 98959a88f..98959a88f 100644
--- a/src/rps/gnunet-service-rps_sampler_elem.h
+++ b/src/contrib/service/rps/gnunet-service-rps_sampler_elem.h
diff --git a/src/rps/gnunet-service-rps_view.c b/src/contrib/service/rps/gnunet-service-rps_view.c
index d58b995a3..d58b995a3 100644
--- a/src/rps/gnunet-service-rps_view.c
+++ b/src/contrib/service/rps/gnunet-service-rps_view.c
diff --git a/src/rps/gnunet-service-rps_view.h b/src/contrib/service/rps/gnunet-service-rps_view.h
index 4d42272c1..4d42272c1 100644
--- a/src/rps/gnunet-service-rps_view.h
+++ b/src/contrib/service/rps/gnunet-service-rps_view.h
diff --git a/src/rps/profiler_rps.conf b/src/contrib/service/rps/profiler_rps.conf
index 89e5e35f2..89e5e35f2 100644
--- a/src/rps/profiler_rps.conf
+++ b/src/contrib/service/rps/profiler_rps.conf
diff --git a/src/rps/rps-sampler_client.c b/src/contrib/service/rps/rps-sampler_client.c
index f6e98ce29..f6e98ce29 100644
--- a/src/rps/rps-sampler_client.c
+++ b/src/contrib/service/rps/rps-sampler_client.c
diff --git a/src/rps/rps-sampler_client.h b/src/contrib/service/rps/rps-sampler_client.h
index 7a674371d..7a674371d 100644
--- a/src/rps/rps-sampler_client.h
+++ b/src/contrib/service/rps/rps-sampler_client.h
diff --git a/src/rps/rps-sampler_common.c b/src/contrib/service/rps/rps-sampler_common.c
index e3fb79501..e3fb79501 100644
--- a/src/rps/rps-sampler_common.c
+++ b/src/contrib/service/rps/rps-sampler_common.c
diff --git a/src/rps/rps-sampler_common.h b/src/contrib/service/rps/rps-sampler_common.h
index 94727028a..94727028a 100644
--- a/src/rps/rps-sampler_common.h
+++ b/src/contrib/service/rps/rps-sampler_common.h
diff --git a/src/rps/rps-test_util.c b/src/contrib/service/rps/rps-test_util.c
index 8fd82f7b3..8fd82f7b3 100644
--- a/src/rps/rps-test_util.c
+++ b/src/contrib/service/rps/rps-test_util.c
diff --git a/src/rps/rps-test_util.h b/src/contrib/service/rps/rps-test_util.h
index 9ff13bdcf..9ff13bdcf 100644
--- a/src/rps/rps-test_util.h
+++ b/src/contrib/service/rps/rps-test_util.h
diff --git a/src/rps/rps.conf.in b/src/contrib/service/rps/rps.conf.in
index 8c7098747..8c7098747 100644
--- a/src/rps/rps.conf.in
+++ b/src/contrib/service/rps/rps.conf.in
diff --git a/src/rps/rps.h b/src/contrib/service/rps/rps.h
index 202f881c9..202f881c9 100644
--- a/src/rps/rps.h
+++ b/src/contrib/service/rps/rps.h
diff --git a/src/rps/rps_api.c b/src/contrib/service/rps/rps_api.c
index c4166745a..c4166745a 100644
--- a/src/rps/rps_api.c
+++ b/src/contrib/service/rps/rps_api.c
diff --git a/src/rps/test_rps.c b/src/contrib/service/rps/test_rps.c
index ab132ec8a..ab132ec8a 100644
--- a/src/rps/test_rps.c
+++ b/src/contrib/service/rps/test_rps.c
diff --git a/src/rps/test_rps.conf b/src/contrib/service/rps/test_rps.conf
index 2b1101786..2b1101786 100644
--- a/src/rps/test_rps.conf
+++ b/src/contrib/service/rps/test_rps.conf
diff --git a/src/rps/test_rps_api.c b/src/contrib/service/rps/test_rps_api.c
index 06dad2887..06dad2887 100644
--- a/src/rps/test_rps_api.c
+++ b/src/contrib/service/rps/test_rps_api.c
diff --git a/src/rps/test_service_rps_custommap.c b/src/contrib/service/rps/test_service_rps_custommap.c
index 82d75b7e0..82d75b7e0 100644
--- a/src/rps/test_service_rps_custommap.c
+++ b/src/contrib/service/rps/test_service_rps_custommap.c
diff --git a/src/rps/test_service_rps_sampler_elem.c b/src/contrib/service/rps/test_service_rps_sampler_elem.c
index afa17611c..afa17611c 100644
--- a/src/rps/test_service_rps_sampler_elem.c
+++ b/src/contrib/service/rps/test_service_rps_sampler_elem.c
diff --git a/src/rps/test_service_rps_view.c b/src/contrib/service/rps/test_service_rps_view.c
index bb1413168..bb1413168 100644
--- a/src/rps/test_service_rps_view.c
+++ b/src/contrib/service/rps/test_service_rps_view.c