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

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated (98c00bad3 -> b56e4e05a)

From:	gnunet
Subject:	[gnunet] branch master updated (98c00bad3 -> b56e4e05a)
Date:	Thu, 19 Oct 2023 11:39:10 +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 98c00bad3 BUILD: Move set/consensus/secretsharing to contrib/service
     new a93ccc1eb BUILD: Move scalarproduct to contrib/service
     new 3bfe2d52d BUILD: Move seti/setu to service
     new 4e28833d9 BUILD: Move revocation to service
     new df59c19d7 BUILD: Move vpn to service
     new 7c7d819e8 BUILD: Move gns/zonemaster to service
     new b56e4e05a BUILD: Move conversation to contrib/service

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


Summary of changes:
 bootstrap                                          |   2 +-
 configure.ac                                       |  40 +--
 po/POTFILES.in                                     | 116 ++++----
 src/Makefile.am                                    |  15 -
 src/cli/.gitignore                                 |   2 +
 src/cli/Makefile.am                                |   3 +
 src/cli/gns/.gitignore                             |   2 +
 src/cli/gns/Makefile.am                            |  98 +++++++
 src/{ => cli}/gns/gnunet-gns-proxy-ca.template     |   0
 src/{ => cli}/gns/gnunet-gns-proxy-setup-ca.in     |   0
 src/{ => cli}/gns/gnunet-gns.c                     |   0
 src/{ => cli}/gns/test_dns2gns.sh                  |   0
 src/{ => cli}/gns/test_gns_at_lookup.sh            |   0
 src/{ => cli}/gns/test_gns_caa_lookup.sh           |   0
 src/{ => cli}/gns/test_gns_config_lookup.sh        |   0
 src/{ => cli}/gns/test_gns_delegated_lookup.sh     |   0
 src/{ => cli}/gns/test_gns_dht_lookup.sh           |   0
 src/{ => cli}/gns/test_gns_gns2dns_cname_lookup.sh |   0
 src/{ => cli}/gns/test_gns_gns2dns_lookup.sh       |   0
 src/{ => cli}/gns/test_gns_gns2dns_zkey_lookup.sh  |   0
 src/{ => cli}/gns/test_gns_ipv6_lookup.sh          |   0
 src/{ => cli}/gns/test_gns_lookup.sh               |   0
 .../gns/test_gns_multiple_record_lookup.sh         |   0
 src/{ => cli}/gns/test_gns_mx_lookup.sh            |   0
 src/{ => cli}/gns/test_gns_quickupdate.sh          |   0
 src/{ => cli}/gns/test_gns_redirect_lookup.sh      |   0
 src/{ => cli}/gns/test_gns_rel_expiration.sh       |   0
 src/{ => cli}/gns/test_gns_revocation.sh           |   0
 src/{ => cli}/gns/test_gns_soa_lookup.sh           |   0
 src/{ => cli}/gns/test_gns_txt_lookup.sh           |   0
 src/{ => cli}/gns/test_gns_zkey_lookup.sh          |   0
 src/cli/revocation/Makefile.am                     |  52 ++++
 src/{ => cli}/revocation/gnunet-revocation-tvg.c   |   3 +-
 src/{ => cli}/revocation/gnunet-revocation.c       |   0
 .../revocation/test_local_revocation.py.in         |   0
 src/cli/vpn/.gitignore                             |   1 +
 src/cli/{datastore => vpn}/Makefile.am             |  22 +-
 src/{ => cli}/vpn/gnunet-vpn.c                     |   0
 src/contrib/service/Makefile.am                    |  10 +
 src/contrib/service/abd/Makefile.am                |   2 +-
 src/{ => contrib/service}/conversation/.gitignore  |   0
 src/{ => contrib/service}/conversation/Makefile.am |   4 +-
 .../service}/conversation/build_gst_test.sh        |   0
 .../service}/conversation/conversation.conf.in     |   0
 .../service}/conversation/conversation.h           |   0
 .../service}/conversation/conversation_api.c       |   0
 .../service}/conversation/conversation_api_call.c  |   0
 .../service}/conversation/displaydot.sh            |   0
 .../conversation/gnunet-conversation-test.c        |   0
 .../service}/conversation/gnunet-conversation.c    |   0
 .../gnunet-helper-audio-playback-gst.c             |   0
 .../conversation/gnunet-helper-audio-playback.c    |   0
 .../conversation/gnunet-helper-audio-record-gst.c  |   0
 .../conversation/gnunet-helper-audio-record.c      |   0
 .../conversation/gnunet-service-conversation.c     |   0
 .../service}/conversation/gnunet_gst.c             |   0
 .../service}/conversation/gnunet_gst.h             |   0
 .../service}/conversation/gnunet_gst_def.h         |   0
 .../service}/conversation/gnunet_gst_test.c        |   0
 .../service}/conversation/mediahelper.conf         |   0
 src/{ => contrib/service}/conversation/meson.build |   0
 .../service}/conversation/microphone.c             |   0
 .../conversation/plugin_gnsrecord_conversation.c   |   0
 src/{ => contrib/service}/conversation/speaker.c   |   0
 src/{ => contrib/service}/conversation/test.sh     |   0
 .../service}/conversation/test_conversation.conf   |   0
 .../service}/conversation/test_conversation_api.c  |   0
 .../conversation/test_conversation_api_reject.c    |   0
 .../conversation/test_conversation_api_twocalls.c  |   0
 src/{ => contrib/service}/scalarproduct/.gitignore |   0
 .../service}/scalarproduct/Makefile.am             |   8 +-
 .../service}/scalarproduct/gnunet-scalarproduct.c  |   0
 .../gnunet-service-scalarproduct-ecc.h             |   0
 .../gnunet-service-scalarproduct-ecc_alice.c       |   0
 .../gnunet-service-scalarproduct-ecc_bob.c         |   0
 .../scalarproduct/gnunet-service-scalarproduct.h   |   0
 .../gnunet-service-scalarproduct_alice.c           |   0
 .../gnunet-service-scalarproduct_bob.c             |   0
 .../service}/scalarproduct/meson.build             |   0
 .../service}/scalarproduct/perf_scalarproduct.sh   |   0
 .../service}/scalarproduct/scalarproduct.conf.in   |   0
 .../service}/scalarproduct/scalarproduct.h         |   0
 .../service}/scalarproduct/scalarproduct_api.c     |   0
 .../scalarproduct/test_ecc_scalarproduct.c         |   0
 .../service}/scalarproduct/test_scalarproduct.conf |   0
 .../service}/scalarproduct/test_scalarproduct.sh   |   0
 .../scalarproduct/test_scalarproduct_negative.sh   |   0
 .../test_scalarproduct_negativezero.sh             |   0
 src/gns/Makefile.am                                | 306 ---------------------
 src/plugin/Makefile.am                             |   4 +-
 src/plugin/gns/Makefile.am                         |  61 ++++
 src/{ => plugin}/gns/plugin_block_gns.c            |   0
 src/{ => plugin}/gns/plugin_gnsrecord_gns.c        |   0
 src/plugin/revocation/Makefile.am                  |  28 ++
 .../revocation/plugin_block_revocation.c           |   3 +-
 src/pt/Makefile.am                                 |  10 +-
 src/reclaim/Makefile.am                            |  10 +-
 src/rest-plugin/Makefile.am                        |   3 +-
 src/rest-plugin/gns/Makefile.am                    |  61 ++++
 src/{ => rest-plugin}/gns/plugin_rest_gns.c        |   0
 src/{ => rest-plugin}/gns/test_plugin_rest_gns.sh  |   0
 src/service/Makefile.am                            |   9 +-
 src/{ => service}/gns/.gitignore                   |   0
 src/service/gns/Makefile.am                        | 180 ++++++++++++
 src/{ => service}/gns/gns.conf.in                  |   0
 src/{ => service}/gns/gns.h                        |   0
 src/{ => service}/gns/gns_api.c                    |   0
 src/{ => service}/gns/gns_api.h                    |   0
 src/{ => service}/gns/gns_tld_api.c                |   0
 src/{ => service}/gns/gnunet-bcd.c                 |   0
 src/{ => service}/gns/gnunet-dns2gns.c             |   0
 src/{ => service}/gns/gnunet-gns-benchmark.c       |   0
 src/{ => service}/gns/gnunet-gns-import.c          |   0
 src/{ => service}/gns/gnunet-gns-proxy.c           |   0
 src/{ => service}/gns/gnunet-service-gns.c         |   0
 src/{ => service}/gns/gnunet-service-gns.h         |   0
 .../gns/gnunet-service-gns_interceptor.c           |   0
 .../gns/gnunet-service-gns_interceptor.h           |   0
 .../gns/gnunet-service-gns_resolver.c              |   0
 .../gns/gnunet-service-gns_resolver.h              |   0
 src/{ => service}/gns/gnunet_w32nsp_lib.h          |   0
 src/{ => service}/gns/meson.build                  |   0
 src/{ => service}/gns/nss/Makefile.am              |   0
 src/{ => service}/gns/nss/map-file                 |   0
 src/{ => service}/gns/nss/meson.build              |   0
 src/{ => service}/gns/nss/nss_gns.c                |   0
 src/{ => service}/gns/nss/nss_gns_query.c          |   0
 src/{ => service}/gns/nss/nss_gns_query.h          |   0
 src/{ => service}/gns/openssl.cnf                  |   0
 src/{ => service}/gns/test_dns2gns.conf            |   0
 src/{ => service}/gns/test_gns_defaults.conf       |   0
 src/{ => service}/gns/test_gns_lookup.conf         |   0
 src/{ => service}/gns/test_gns_lookup_peer1.conf   |   0
 src/{ => service}/gns/test_gns_lookup_peer2.conf   |   0
 src/{ => service}/gns/test_gns_proxy.c             |   0
 src/{ => service}/gns/test_gns_proxy.conf          |   0
 src/{ => service}/gns/test_gns_simple_lookup.conf  |   0
 src/{ => service}/gns/test_gnunet_gns.sh.in        |   0
 src/{ => service}/gns/test_proxy.sh                |   0
 src/{ => service}/gns/tlds.conf                    |   0
 src/{ => service}/gns/w32resolver.h                |   0
 ...25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey | Bin
 ...8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey | Bin
 ...1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey | Bin
 src/{ => service}/gns/zonefiles/test_zonekey       | Bin
 src/{ => service}/revocation/.gitignore            |   0
 src/{ => service}/revocation/Makefile.am           |  50 +---
 .../revocation/gnunet-service-revocation.c         |   0
 src/{ => service}/revocation/meson.build           |   0
 src/{ => service}/revocation/revocation.conf.in    |   0
 src/{ => service}/revocation/revocation.h          |   0
 src/{ => service}/revocation/revocation_api.c      |   0
 src/{ => service}/revocation/test_revocation.c     |   0
 src/{ => service}/revocation/test_revocation.conf  |   0
 .../revocation/test_revocation_testvectors.c       |   0
 src/{ => service}/seti/.gitignore                  |   0
 src/{ => service}/seti/Makefile.am                 |   0
 src/{ => service}/seti/gnunet-service-seti.c       |   0
 .../seti/gnunet-service-seti_protocol.h            |   0
 src/{ => service}/seti/gnunet-seti-profiler.c      |   0
 src/{ => service}/seti/meson.build                 |   0
 src/{ => service}/seti/plugin_block_seti_test.c    |   0
 src/{ => service}/seti/seti.conf.in                |   0
 src/{ => service}/seti/seti.h                      |   0
 src/{ => service}/seti/seti_api.c                  |   0
 src/{ => service}/seti/test_seti.conf              |   0
 src/{ => service}/seti/test_seti_api.c             |   0
 src/{ => service}/setu/.gitignore                  |   0
 src/{ => service}/setu/Makefile.am                 |   0
 src/{ => service}/setu/gnunet-service-setu.c       |   0
 .../setu/gnunet-service-setu_protocol.h            |   0
 .../setu/gnunet-service-setu_strata_estimator.c    |   0
 .../setu/gnunet-service-setu_strata_estimator.h    |   0
 src/{ => service}/setu/gnunet-setu-ibf-profiler.c  |   0
 src/{ => service}/setu/gnunet-setu-profiler.c      |   0
 src/{ => service}/setu/ibf.c                       |   0
 src/{ => service}/setu/ibf.h                       |   0
 src/{ => service}/setu/ibf_sim.c                   |   0
 src/{ => service}/setu/meson.build                 |   0
 src/{ => service}/setu/perf_setu_api.c             |   0
 src/{ => service}/setu/plugin_block_setu_test.c    |   0
 src/{ => service}/setu/setu.conf.in                |   0
 src/{ => service}/setu/setu.h                      |   0
 src/{ => service}/setu/setu_api.c                  |   0
 src/{ => service}/setu/test_setu.conf              |   0
 src/{ => service}/setu/test_setu_api.c             |   0
 src/service/testing/.gitignore                     |   1 +
 src/{ => service}/vpn/.gitignore                   |   0
 src/{ => service}/vpn/Makefile.am                  |  10 -
 src/{ => service}/vpn/gnunet-helper-vpn.c          |   0
 src/{ => service}/vpn/gnunet-service-vpn.c         |   0
 src/{ => service}/vpn/meson.build                  |   0
 src/{ => service}/vpn/tests/expected               | Bin
 src/{ => service}/vpn/tests/ping                   | Bin
 src/{ => service}/vpn/tests/test-helper-icmp.sh    |   0
 src/{ => service}/vpn/tests/test-helper-ifaddr.sh  |   0
 src/{ => service}/vpn/vpn.conf.in                  |   0
 src/{ => service}/vpn/vpn.h                        |   0
 src/{ => service}/vpn/vpn_api.c                    |   0
 src/{ => service}/zonemaster/.gitignore            |   0
 src/{ => service}/zonemaster/Makefile.am           |   0
 .../zonemaster/gnunet-service-zonemaster.c         |   0
 src/{ => service}/zonemaster/meson.build           |   0
 src/{ => service}/zonemaster/zonemaster.conf.in    |   0
 204 files changed, 627 insertions(+), 489 deletions(-)
 create mode 100644 src/cli/.gitignore
 create mode 100644 src/cli/gns/.gitignore
 create mode 100644 src/cli/gns/Makefile.am
 rename src/{ => cli}/gns/gnunet-gns-proxy-ca.template (100%)
 rename src/{ => cli}/gns/gnunet-gns-proxy-setup-ca.in (100%)
 rename src/{ => cli}/gns/gnunet-gns.c (100%)
 rename src/{ => cli}/gns/test_dns2gns.sh (100%)
 rename src/{ => cli}/gns/test_gns_at_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_caa_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_config_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_delegated_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_dht_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_gns2dns_cname_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_gns2dns_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_gns2dns_zkey_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_ipv6_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_multiple_record_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_mx_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_quickupdate.sh (100%)
 rename src/{ => cli}/gns/test_gns_redirect_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_rel_expiration.sh (100%)
 rename src/{ => cli}/gns/test_gns_revocation.sh (100%)
 rename src/{ => cli}/gns/test_gns_soa_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_txt_lookup.sh (100%)
 rename src/{ => cli}/gns/test_gns_zkey_lookup.sh (100%)
 create mode 100644 src/cli/revocation/Makefile.am
 rename src/{ => cli}/revocation/gnunet-revocation-tvg.c (98%)
 rename src/{ => cli}/revocation/gnunet-revocation.c (100%)
 rename src/{ => cli}/revocation/test_local_revocation.py.in (100%)
 create mode 100644 src/cli/vpn/.gitignore
 copy src/cli/{datastore => vpn}/Makefile.am (56%)
 rename src/{ => cli}/vpn/gnunet-vpn.c (100%)
 rename src/{ => contrib/service}/conversation/.gitignore (100%)
 rename src/{ => contrib/service}/conversation/Makefile.am (98%)
 rename src/{ => contrib/service}/conversation/build_gst_test.sh (100%)
 rename src/{ => contrib/service}/conversation/conversation.conf.in (100%)
 rename src/{ => contrib/service}/conversation/conversation.h (100%)
 rename src/{ => contrib/service}/conversation/conversation_api.c (100%)
 rename src/{ => contrib/service}/conversation/conversation_api_call.c (100%)
 rename src/{ => contrib/service}/conversation/displaydot.sh (100%)
 rename src/{ => contrib/service}/conversation/gnunet-conversation-test.c (100%)
 rename src/{ => contrib/service}/conversation/gnunet-conversation.c (100%)
 rename src/{ => 
contrib/service}/conversation/gnunet-helper-audio-playback-gst.c (100%)
 rename src/{ => contrib/service}/conversation/gnunet-helper-audio-playback.c 
(100%)
 rename src/{ => contrib/service}/conversation/gnunet-helper-audio-record-gst.c 
(100%)
 rename src/{ => contrib/service}/conversation/gnunet-helper-audio-record.c 
(100%)
 rename src/{ => contrib/service}/conversation/gnunet-service-conversation.c 
(100%)
 rename src/{ => contrib/service}/conversation/gnunet_gst.c (100%)
 rename src/{ => contrib/service}/conversation/gnunet_gst.h (100%)
 rename src/{ => contrib/service}/conversation/gnunet_gst_def.h (100%)
 rename src/{ => contrib/service}/conversation/gnunet_gst_test.c (100%)
 rename src/{ => contrib/service}/conversation/mediahelper.conf (100%)
 rename src/{ => contrib/service}/conversation/meson.build (100%)
 rename src/{ => contrib/service}/conversation/microphone.c (100%)
 rename src/{ => contrib/service}/conversation/plugin_gnsrecord_conversation.c 
(100%)
 rename src/{ => contrib/service}/conversation/speaker.c (100%)
 rename src/{ => contrib/service}/conversation/test.sh (100%)
 rename src/{ => contrib/service}/conversation/test_conversation.conf (100%)
 rename src/{ => contrib/service}/conversation/test_conversation_api.c (100%)
 rename src/{ => contrib/service}/conversation/test_conversation_api_reject.c 
(100%)
 rename src/{ => contrib/service}/conversation/test_conversation_api_twocalls.c 
(100%)
 rename src/{ => contrib/service}/scalarproduct/.gitignore (100%)
 rename src/{ => contrib/service}/scalarproduct/Makefile.am (93%)
 rename src/{ => contrib/service}/scalarproduct/gnunet-scalarproduct.c (100%)
 rename src/{ => 
contrib/service}/scalarproduct/gnunet-service-scalarproduct-ecc.h (100%)
 rename src/{ => 
contrib/service}/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c (100%)
 rename src/{ => 
contrib/service}/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c (100%)
 rename src/{ => contrib/service}/scalarproduct/gnunet-service-scalarproduct.h 
(100%)
 rename src/{ => 
contrib/service}/scalarproduct/gnunet-service-scalarproduct_alice.c (100%)
 rename src/{ => 
contrib/service}/scalarproduct/gnunet-service-scalarproduct_bob.c (100%)
 rename src/{ => contrib/service}/scalarproduct/meson.build (100%)
 rename src/{ => contrib/service}/scalarproduct/perf_scalarproduct.sh (100%)
 rename src/{ => contrib/service}/scalarproduct/scalarproduct.conf.in (100%)
 rename src/{ => contrib/service}/scalarproduct/scalarproduct.h (100%)
 rename src/{ => contrib/service}/scalarproduct/scalarproduct_api.c (100%)
 rename src/{ => contrib/service}/scalarproduct/test_ecc_scalarproduct.c (100%)
 rename src/{ => contrib/service}/scalarproduct/test_scalarproduct.conf (100%)
 rename src/{ => contrib/service}/scalarproduct/test_scalarproduct.sh (100%)
 rename src/{ => contrib/service}/scalarproduct/test_scalarproduct_negative.sh 
(100%)
 rename src/{ => 
contrib/service}/scalarproduct/test_scalarproduct_negativezero.sh (100%)
 delete mode 100644 src/gns/Makefile.am
 create mode 100644 src/plugin/gns/Makefile.am
 rename src/{ => plugin}/gns/plugin_block_gns.c (100%)
 rename src/{ => plugin}/gns/plugin_gnsrecord_gns.c (100%)
 create mode 100644 src/plugin/revocation/Makefile.am
 rename src/{ => plugin}/revocation/plugin_block_revocation.c (98%)
 create mode 100644 src/rest-plugin/gns/Makefile.am
 rename src/{ => rest-plugin}/gns/plugin_rest_gns.c (100%)
 rename src/{ => rest-plugin}/gns/test_plugin_rest_gns.sh (100%)
 rename src/{ => service}/gns/.gitignore (100%)
 create mode 100644 src/service/gns/Makefile.am
 rename src/{ => service}/gns/gns.conf.in (100%)
 rename src/{ => service}/gns/gns.h (100%)
 rename src/{ => service}/gns/gns_api.c (100%)
 rename src/{ => service}/gns/gns_api.h (100%)
 rename src/{ => service}/gns/gns_tld_api.c (100%)
 rename src/{ => service}/gns/gnunet-bcd.c (100%)
 rename src/{ => service}/gns/gnunet-dns2gns.c (100%)
 rename src/{ => service}/gns/gnunet-gns-benchmark.c (100%)
 rename src/{ => service}/gns/gnunet-gns-import.c (100%)
 rename src/{ => service}/gns/gnunet-gns-proxy.c (100%)
 rename src/{ => service}/gns/gnunet-service-gns.c (100%)
 rename src/{ => service}/gns/gnunet-service-gns.h (100%)
 rename src/{ => service}/gns/gnunet-service-gns_interceptor.c (100%)
 rename src/{ => service}/gns/gnunet-service-gns_interceptor.h (100%)
 rename src/{ => service}/gns/gnunet-service-gns_resolver.c (100%)
 rename src/{ => service}/gns/gnunet-service-gns_resolver.h (100%)
 rename src/{ => service}/gns/gnunet_w32nsp_lib.h (100%)
 rename src/{ => service}/gns/meson.build (100%)
 rename src/{ => service}/gns/nss/Makefile.am (100%)
 rename src/{ => service}/gns/nss/map-file (100%)
 rename src/{ => service}/gns/nss/meson.build (100%)
 rename src/{ => service}/gns/nss/nss_gns.c (100%)
 rename src/{ => service}/gns/nss/nss_gns_query.c (100%)
 rename src/{ => service}/gns/nss/nss_gns_query.h (100%)
 rename src/{ => service}/gns/openssl.cnf (100%)
 rename src/{ => service}/gns/test_dns2gns.conf (100%)
 rename src/{ => service}/gns/test_gns_defaults.conf (100%)
 rename src/{ => service}/gns/test_gns_lookup.conf (100%)
 rename src/{ => service}/gns/test_gns_lookup_peer1.conf (100%)
 rename src/{ => service}/gns/test_gns_lookup_peer2.conf (100%)
 rename src/{ => service}/gns/test_gns_proxy.c (100%)
 rename src/{ => service}/gns/test_gns_proxy.conf (100%)
 rename src/{ => service}/gns/test_gns_simple_lookup.conf (100%)
 rename src/{ => service}/gns/test_gnunet_gns.sh.in (100%)
 rename src/{ => service}/gns/test_proxy.sh (100%)
 rename src/{ => service}/gns/tlds.conf (100%)
 rename src/{ => service}/gns/w32resolver.h (100%)
 rename src/{ => 
service}/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
 (100%)
 rename src/{ => 
service}/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
 (100%)
 rename src/{ => 
service}/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
 (100%)
 rename src/{ => service}/gns/zonefiles/test_zonekey (100%)
 rename src/{ => service}/revocation/.gitignore (100%)
 rename src/{ => service}/revocation/Makefile.am (55%)
 rename src/{ => service}/revocation/gnunet-service-revocation.c (100%)
 rename src/{ => service}/revocation/meson.build (100%)
 rename src/{ => service}/revocation/revocation.conf.in (100%)
 rename src/{ => service}/revocation/revocation.h (100%)
 rename src/{ => service}/revocation/revocation_api.c (100%)
 rename src/{ => service}/revocation/test_revocation.c (100%)
 rename src/{ => service}/revocation/test_revocation.conf (100%)
 rename src/{ => service}/revocation/test_revocation_testvectors.c (100%)
 rename src/{ => service}/seti/.gitignore (100%)
 rename src/{ => service}/seti/Makefile.am (100%)
 rename src/{ => service}/seti/gnunet-service-seti.c (100%)
 rename src/{ => service}/seti/gnunet-service-seti_protocol.h (100%)
 rename src/{ => service}/seti/gnunet-seti-profiler.c (100%)
 rename src/{ => service}/seti/meson.build (100%)
 rename src/{ => service}/seti/plugin_block_seti_test.c (100%)
 rename src/{ => service}/seti/seti.conf.in (100%)
 rename src/{ => service}/seti/seti.h (100%)
 rename src/{ => service}/seti/seti_api.c (100%)
 rename src/{ => service}/seti/test_seti.conf (100%)
 rename src/{ => service}/seti/test_seti_api.c (100%)
 rename src/{ => service}/setu/.gitignore (100%)
 rename src/{ => service}/setu/Makefile.am (100%)
 rename src/{ => service}/setu/gnunet-service-setu.c (100%)
 rename src/{ => service}/setu/gnunet-service-setu_protocol.h (100%)
 rename src/{ => service}/setu/gnunet-service-setu_strata_estimator.c (100%)
 rename src/{ => service}/setu/gnunet-service-setu_strata_estimator.h (100%)
 rename src/{ => service}/setu/gnunet-setu-ibf-profiler.c (100%)
 rename src/{ => service}/setu/gnunet-setu-profiler.c (100%)
 rename src/{ => service}/setu/ibf.c (100%)
 rename src/{ => service}/setu/ibf.h (100%)
 rename src/{ => service}/setu/ibf_sim.c (100%)
 rename src/{ => service}/setu/meson.build (100%)
 rename src/{ => service}/setu/perf_setu_api.c (100%)
 rename src/{ => service}/setu/plugin_block_setu_test.c (100%)
 rename src/{ => service}/setu/setu.conf.in (100%)
 rename src/{ => service}/setu/setu.h (100%)
 rename src/{ => service}/setu/setu_api.c (100%)
 rename src/{ => service}/setu/test_setu.conf (100%)
 rename src/{ => service}/setu/test_setu_api.c (100%)
 rename src/{ => service}/vpn/.gitignore (100%)
 rename src/{ => service}/vpn/Makefile.am (86%)
 rename src/{ => service}/vpn/gnunet-helper-vpn.c (100%)
 rename src/{ => service}/vpn/gnunet-service-vpn.c (100%)
 rename src/{ => service}/vpn/meson.build (100%)
 rename src/{ => service}/vpn/tests/expected (100%)
 rename src/{ => service}/vpn/tests/ping (100%)
 rename src/{ => service}/vpn/tests/test-helper-icmp.sh (100%)
 rename src/{ => service}/vpn/tests/test-helper-ifaddr.sh (100%)
 rename src/{ => service}/vpn/vpn.conf.in (100%)
 rename src/{ => service}/vpn/vpn.h (100%)
 rename src/{ => service}/vpn/vpn_api.c (100%)
 rename src/{ => service}/zonemaster/.gitignore (100%)
 rename src/{ => service}/zonemaster/Makefile.am (100%)
 rename src/{ => service}/zonemaster/gnunet-service-zonemaster.c (100%)
 rename src/{ => service}/zonemaster/meson.build (100%)
 rename src/{ => service}/zonemaster/zonemaster.conf.in (100%)

diff --git a/bootstrap b/bootstrap
index b635132a0..5e3185442 100755
--- a/bootstrap
+++ b/bootstrap
@@ -148,7 +148,7 @@ gana_update()
       echo "Creating default TLDs"
       cd ../gnu-name-system-default-tlds && \
          make >/dev/null && \
-         cp tlds.conf ../../../src/gns || exit 1
+         cp tlds.conf ../../../src/service/gns || exit 1
 
       # Signatures
       echo "Updating GNUnet signatures"
diff --git a/configure.ac b/configure.ac
index 5df94e8e7..36580913c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1240,9 +1240,11 @@ src/lib/sq/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/dhtu/Makefile
+src/plugin/gns/Makefile
 src/plugin/gnsrecord/Makefile
 src/plugin/namecache/Makefile
 src/plugin/namestore/Makefile
+src/plugin/revocation/Makefile
 src/service/Makefile
 src/service/arm/Makefile
 src/service/arm/arm.conf
@@ -1257,6 +1259,9 @@ src/service/dht/Makefile
 src/service/dht/dht.conf
 src/service/dns/Makefile
 src/service/dns/dns.conf
+src/service/gns/Makefile
+src/service/gns/gns.conf
+src/service/gns/nss/Makefile
 src/service/hostlist/Makefile
 src/service/identity/Makefile
 src/service/identity/identity.conf
@@ -1275,6 +1280,12 @@ src/service/peerstore/peerstore.conf
 src/service/regex/Makefile
 src/service/regex/regex.conf
 src/service/rest/Makefile
+src/service/revocation/Makefile
+src/service/revocation/revocation.conf
+src/service/seti/Makefile
+src/service/seti/seti.conf
+src/service/setu/Makefile
+src/service/setu/setu.conf
 src/service/statistics/Makefile
 src/service/statistics/statistics.conf
 src/service/testing/Makefile
@@ -1282,7 +1293,12 @@ src/service/topology/Makefile
 src/service/transport/Makefile
 src/service/transport/transport.conf
 src/service/util/Makefile
+src/service/vpn/Makefile
+src/service/vpn/vpn.conf
+src/service/zonemaster/Makefile
+src/service/zonemaster/zonemaster.conf
 src/rest-plugin/Makefile
+src/rest-plugin/gns/Makefile
 src/rest-plugin/identity/Makefile
 src/rest-plugin/rest/Makefile
 src/cli/Makefile
@@ -1291,13 +1307,16 @@ src/cli/cadet/Makefile
 src/cli/core/Makefile
 src/cli/datastore/Makefile
 src/cli/dht/Makefile
+src/cli/gns/Makefile
 src/cli/namecache/Makefile
 src/cli/namestore/Makefile
 src/cli/nat/Makefile
 src/cli/nat-auto/Makefile
 src/cli/nse/Makefile
+src/cli/revocation/Makefile
 src/cli/statistics/Makefile
 src/cli/util/Makefile
+src/cli/vpn/Makefile
 src/contrib/Makefile
 src/contrib/service/Makefile
 src/contrib/service/abd/Makefile
@@ -1305,6 +1324,10 @@ 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/conversation/Makefile
+src/contrib/service/conversation/conversation.conf
+src/contrib/service/scalarproduct/Makefile
+src/contrib/service/scalarproduct/scalarproduct.conf
 src/contrib/service/secretsharing/Makefile
 src/contrib/service/secretsharing/secretsharing.conf
 src/contrib/service/set/Makefile
@@ -1313,30 +1336,13 @@ src/contrib/service/rps/Makefile
 src/contrib/service/rps/rps.conf
 src/contrib/service/template/Makefile
 src/contrib/cli/template/Makefile
-src/conversation/Makefile
-src/conversation/conversation.conf
 src/exit/Makefile
 src/fs/Makefile
 src/fs/fs.conf
-src/gns/Makefile
-src/gns/gns.conf
-src/gns/nss/Makefile
 src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
 src/pt/Makefile
-src/revocation/Makefile
-src/revocation/revocation.conf
-src/scalarproduct/Makefile
-src/scalarproduct/scalarproduct.conf
-src/seti/Makefile
-src/seti/seti.conf
-src/setu/Makefile
-src/setu/setu.conf
-src/vpn/Makefile
-src/vpn/vpn.conf
-src/zonemaster/Makefile
-src/zonemaster/zonemaster.conf
 src/reclaim/Makefile
 src/messenger/Makefile
 src/messenger/messenger.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 05bc968e4..c1e58aa2c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,6 +6,7 @@ src/cli/dht/gnunet-dht-get.c
 src/cli/dht/gnunet-dht-hello.c
 src/cli/dht/gnunet-dht-monitor.c
 src/cli/dht/gnunet-dht-put.c
+src/cli/gns/gnunet-gns.c
 src/cli/identity/gnunet-identity.c
 src/cli/namecache/gnunet-namecache.c
 src/cli/namestore/gnunet-namestore-dbtool.c
@@ -16,6 +17,8 @@ src/cli/nat-auto/gnunet-nat-auto.c
 src/cli/nat-auto/gnunet-nat-server.c
 src/cli/nat/gnunet-nat.c
 src/cli/nse/gnunet-nse.c
+src/cli/revocation/gnunet-revocation-tvg.c
+src/cli/revocation/gnunet-revocation.c
 src/cli/statistics/gnunet-statistics.c
 src/cli/util/gnunet-base32.c
 src/cli/util/gnunet-config-diff.c
@@ -27,6 +30,7 @@ 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/cli/vpn/gnunet-vpn.c
 src/contrib/cli/template/gnunet-template.c
 src/contrib/service/abd/abd_api.c
 src/contrib/service/abd/abd_serialization.c
@@ -41,6 +45,20 @@ 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/conversation/conversation_api.c
+src/contrib/service/conversation/conversation_api_call.c
+src/contrib/service/conversation/gnunet-conversation-test.c
+src/contrib/service/conversation/gnunet-conversation.c
+src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c
+src/contrib/service/conversation/gnunet-helper-audio-playback.c
+src/contrib/service/conversation/gnunet-helper-audio-record-gst.c
+src/contrib/service/conversation/gnunet-helper-audio-record.c
+src/contrib/service/conversation/gnunet-service-conversation.c
+src/contrib/service/conversation/gnunet_gst.c
+src/contrib/service/conversation/gnunet_gst_test.c
+src/contrib/service/conversation/microphone.c
+src/contrib/service/conversation/plugin_gnsrecord_conversation.c
+src/contrib/service/conversation/speaker.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 +70,12 @@ 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/scalarproduct/gnunet-scalarproduct.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
+src/contrib/service/scalarproduct/scalarproduct_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
@@ -67,20 +91,6 @@ 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
-src/conversation/gnunet-conversation-test.c
-src/conversation/gnunet-conversation.c
-src/conversation/gnunet-helper-audio-playback-gst.c
-src/conversation/gnunet-helper-audio-playback.c
-src/conversation/gnunet-helper-audio-record-gst.c
-src/conversation/gnunet-helper-audio-record.c
-src/conversation/gnunet-service-conversation.c
-src/conversation/gnunet_gst.c
-src/conversation/gnunet_gst_test.c
-src/conversation/microphone.c
-src/conversation/plugin_gnsrecord_conversation.c
-src/conversation/speaker.c
 src/exit/gnunet-daemon-exit.c
 src/exit/gnunet-helper-exit.c
 src/fs/fs_api.c
@@ -123,22 +133,6 @@ src/fs/gnunet-unindex.c
 src/fs/meta_data.c
 src/fs/plugin_block_fs.c
 src/gana/gnunet-error-codes/gnunet_error_codes.c
-src/gns/gns_api.c
-src/gns/gns_tld_api.c
-src/gns/gnunet-bcd.c
-src/gns/gnunet-dns2gns.c
-src/gns/gnunet-gns-benchmark.c
-src/gns/gnunet-gns-import.c
-src/gns/gnunet-gns-proxy.c
-src/gns/gnunet-gns.c
-src/gns/gnunet-service-gns.c
-src/gns/gnunet-service-gns_interceptor.c
-src/gns/gnunet-service-gns_resolver.c
-src/gns/nss/nss_gns.c
-src/gns/nss/nss_gns_query.c
-src/gns/plugin_block_gns.c
-src/gns/plugin_gnsrecord_gns.c
-src/gns/plugin_rest_gns.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
 src/lib/curl/curl.c
@@ -279,6 +273,8 @@ src/plugin/block/plugin_block_test.c
 src/plugin/dhtu/plugin_dhtu_gnunet.c
 src/plugin/dhtu/plugin_dhtu_ip.c
 src/plugin/dhtu/testing_dhtu_cmd_send.c
+src/plugin/gns/plugin_block_gns.c
+src/plugin/gns/plugin_gnsrecord_gns.c
 src/plugin/gnsrecord/plugin_gnsrecord_dns.c
 src/plugin/namecache/plugin_namecache_flat.c
 src/plugin/namecache/plugin_namecache_postgres.c
@@ -287,6 +283,7 @@ 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/plugin/revocation/plugin_block_revocation.c
 src/pt/gnunet-daemon-pt.c
 src/reclaim/did_core.c
 src/reclaim/did_helper.c
@@ -308,20 +305,10 @@ src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/reclaim/reclaim_attribute.c
 src/reclaim/reclaim_credential.c
+src/rest-plugin/gns/plugin_rest_gns.c
 src/rest-plugin/identity/plugin_rest_identity.c
 src/rest-plugin/rest/plugin_rest_config.c
 src/rest-plugin/rest/plugin_rest_copying.c
-src/revocation/gnunet-revocation-tvg.c
-src/revocation/gnunet-revocation.c
-src/revocation/gnunet-service-revocation.c
-src/revocation/plugin_block_revocation.c
-src/revocation/revocation_api.c
-src/scalarproduct/gnunet-scalarproduct.c
-src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
-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/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
@@ -378,6 +365,18 @@ src/service/dns/gnunet-helper-dns.c
 src/service/dns/gnunet-service-dns.c
 src/service/dns/gnunet-zonewalk.c
 src/service/dns/plugin_block_dns.c
+src/service/gns/gns_api.c
+src/service/gns/gns_tld_api.c
+src/service/gns/gnunet-bcd.c
+src/service/gns/gnunet-dns2gns.c
+src/service/gns/gnunet-gns-benchmark.c
+src/service/gns/gnunet-gns-import.c
+src/service/gns/gnunet-gns-proxy.c
+src/service/gns/gnunet-service-gns.c
+src/service/gns/gnunet-service-gns_interceptor.c
+src/service/gns/gnunet-service-gns_resolver.c
+src/service/gns/nss/nss_gns.c
+src/service/gns/nss/nss_gns_query.c
 src/service/hostlist/gnunet-daemon-hostlist.c
 src/service/hostlist/gnunet-daemon-hostlist_client.c
 src/service/hostlist/gnunet-daemon-hostlist_server.c
@@ -430,6 +429,20 @@ src/service/regex/regex_test_lib.c
 src/service/regex/regex_test_random.c
 src/service/rest/gnunet-rest-server.c
 src/service/rest/rest.c
+src/service/revocation/gnunet-service-revocation.c
+src/service/revocation/revocation_api.c
+src/service/seti/gnunet-service-seti.c
+src/service/seti/gnunet-seti-profiler.c
+src/service/seti/plugin_block_seti_test.c
+src/service/seti/seti_api.c
+src/service/setu/gnunet-service-setu.c
+src/service/setu/gnunet-service-setu_strata_estimator.c
+src/service/setu/gnunet-setu-ibf-profiler.c
+src/service/setu/gnunet-setu-profiler.c
+src/service/setu/ibf.c
+src/service/setu/ibf_sim.c
+src/service/setu/plugin_block_setu_test.c
+src/service/setu/setu_api.c
 src/service/statistics/gnunet-service-statistics.c
 src/service/statistics/statistics_api.c
 src/service/testing/gnunet-cmds-helper.c
@@ -479,23 +492,10 @@ 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/seti/gnunet-service-seti.c
-src/seti/gnunet-seti-profiler.c
-src/seti/plugin_block_seti_test.c
-src/seti/seti_api.c
-src/setu/gnunet-service-setu.c
-src/setu/gnunet-service-setu_strata_estimator.c
-src/setu/gnunet-setu-ibf-profiler.c
-src/setu/gnunet-setu-profiler.c
-src/setu/ibf.c
-src/setu/ibf_sim.c
-src/setu/plugin_block_setu_test.c
-src/setu/setu_api.c
-src/vpn/gnunet-helper-vpn.c
-src/vpn/gnunet-service-vpn.c
-src/vpn/gnunet-vpn.c
-src/vpn/vpn_api.c
-src/zonemaster/gnunet-service-zonemaster.c
+src/service/vpn/gnunet-helper-vpn.c
+src/service/vpn/gnunet-service-vpn.c
+src/service/vpn/vpn_api.c
+src/service/zonemaster/gnunet-service-zonemaster.c
 src/fs/fs_api.h
 src/include/gnunet_json_lib.h
 src/include/gnunet_pq_lib.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0cafaf276..0d1607b6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,6 @@
 # This Makefile.am is in the public domain
 
 
-if BUILD_PULSE_HELPERS
-CONVERSATION_DIR = conversation
-else
-if BUILD_GST_HELPERS
-CONVERSATION_DIR = conversation
-endif
-endif
 
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
@@ -17,14 +10,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  seti \
-  setu \
-  scalarproduct \
-  revocation \
-  vpn \
-  gns \
-  zonemaster \
-  $(CONVERSATION_DIR) \
   fs \
   exit \
   pt \
diff --git a/src/cli/.gitignore b/src/cli/.gitignore
new file mode 100644
index 000000000..cedad92f1
--- /dev/null
+++ b/src/cli/.gitignore
@@ -0,0 +1,2 @@
+gnunet-revocation
+gnunet-revocation-tvg
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 78ff8b07b..e968c0bce 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -10,4 +10,7 @@ SUBDIRS = \
        dht \
        namecache \
        namestore \
+       revocation \
+       vpn \
+       gns \
        cadet
diff --git a/src/cli/gns/.gitignore b/src/cli/gns/.gitignore
new file mode 100644
index 000000000..23bd1d13b
--- /dev/null
+++ b/src/cli/gns/.gitignore
@@ -0,0 +1,2 @@
+gnunet-gns
+gnunet-gns-proxy-setup-ca
diff --git a/src/cli/gns/Makefile.am b/src/cli/gns/Makefile.am
new file mode 100644
index 000000000..0b41fbb19
--- /dev/null
+++ b/src/cli/gns/Makefile.am
@@ -0,0 +1,98 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgdata_DATA = \
+  gnunet-gns-proxy-ca.template
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir = $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+bin_PROGRAMS = \
+  gnunet-gns
+
+bin_SCRIPTS = \
+  gnunet-gns-proxy-setup-ca
+
+gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile
+       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca
+       @chmod +x gnunet-gns-proxy-setup-ca
+
+test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile
+       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh
+       @chmod +x test_gnunet_gns.sh
+
+CLEANFILES = test_gnunet_gns.sh
+
+gnunet_gns_SOURCES = \
+ gnunet-gns.c
+gnunet_gns_LDADD = \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LIBIDN) $(LIBIDN2) \
+  $(GN_LIBINTL)
+
+check_SCRIPTS = \
+   test_gns_lookup.sh \
+   test_gns_config_lookup.sh \
+   test_gns_ipv6_lookup.sh\
+   test_gns_txt_lookup.sh\
+   test_gns_caa_lookup.sh\
+   test_gns_mx_lookup.sh \
+   test_gns_gns2dns_lookup.sh \
+   test_gns_gns2dns_zkey_lookup.sh \
+   test_gns_gns2dns_cname_lookup.sh \
+   test_gns_dht_lookup.sh\
+   test_gns_delegated_lookup.sh \
+   test_gns_at_lookup.sh\
+   test_gns_zkey_lookup.sh\
+   test_gns_rel_expiration.sh\
+   test_gns_soa_lookup.sh\
+   test_gns_revocation.sh\
+   test_gns_redirect_lookup.sh
+
+EXTRA_DIST = \
+  test_gns_defaults.conf \
+  test_gns_lookup.conf \
+  test_gns_proxy.conf \
+  test_gns_simple_lookup.conf \
+  openssl.cnf \
+  gnunet-gns-proxy-setup-ca.in \
+  zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \
+  zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
+  zonefiles/test_zonekey \
+  test_gns_lookup.sh \
+  test_gns_config_lookup.sh \
+  test_gns_ipv6_lookup.sh\
+  test_gns_txt_lookup.sh\
+  test_gns_caa_lookup.sh\
+  test_gns_mx_lookup.sh \
+  test_gns_gns2dns_lookup.sh \
+  test_gns_gns2dns_zkey_lookup.sh \
+  test_gns_gns2dns_cname_lookup.sh \
+  test_gns_dht_lookup.sh\
+  test_gns_delegated_lookup.sh \
+  test_gns_at_lookup.sh\
+  test_gns_zkey_lookup.sh\
+  test_gns_rel_expiration.sh\
+  test_gns_soa_lookup.sh\
+  test_gns_revocation.sh\
+  test_gns_redirect_lookup.sh\
+  test_proxy.sh\
+       $(pkgdata_DATA) \
+  test_gnunet_gns.sh.in
+
+if ENABLE_TEST_RUN
+if HAVE_SQLITE
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
+ TESTS = $(check_SCRIPTS)
+endif
+endif
diff --git a/src/gns/gnunet-gns-proxy-ca.template 
b/src/cli/gns/gnunet-gns-proxy-ca.template
similarity index 100%
rename from src/gns/gnunet-gns-proxy-ca.template
rename to src/cli/gns/gnunet-gns-proxy-ca.template
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in 
b/src/cli/gns/gnunet-gns-proxy-setup-ca.in
similarity index 100%
rename from src/gns/gnunet-gns-proxy-setup-ca.in
rename to src/cli/gns/gnunet-gns-proxy-setup-ca.in
diff --git a/src/gns/gnunet-gns.c b/src/cli/gns/gnunet-gns.c
similarity index 100%
rename from src/gns/gnunet-gns.c
rename to src/cli/gns/gnunet-gns.c
diff --git a/src/gns/test_dns2gns.sh b/src/cli/gns/test_dns2gns.sh
similarity index 100%
rename from src/gns/test_dns2gns.sh
rename to src/cli/gns/test_dns2gns.sh
diff --git a/src/gns/test_gns_at_lookup.sh b/src/cli/gns/test_gns_at_lookup.sh
similarity index 100%
rename from src/gns/test_gns_at_lookup.sh
rename to src/cli/gns/test_gns_at_lookup.sh
diff --git a/src/gns/test_gns_caa_lookup.sh b/src/cli/gns/test_gns_caa_lookup.sh
similarity index 100%
rename from src/gns/test_gns_caa_lookup.sh
rename to src/cli/gns/test_gns_caa_lookup.sh
diff --git a/src/gns/test_gns_config_lookup.sh 
b/src/cli/gns/test_gns_config_lookup.sh
similarity index 100%
rename from src/gns/test_gns_config_lookup.sh
rename to src/cli/gns/test_gns_config_lookup.sh
diff --git a/src/gns/test_gns_delegated_lookup.sh 
b/src/cli/gns/test_gns_delegated_lookup.sh
similarity index 100%
rename from src/gns/test_gns_delegated_lookup.sh
rename to src/cli/gns/test_gns_delegated_lookup.sh
diff --git a/src/gns/test_gns_dht_lookup.sh b/src/cli/gns/test_gns_dht_lookup.sh
similarity index 100%
rename from src/gns/test_gns_dht_lookup.sh
rename to src/cli/gns/test_gns_dht_lookup.sh
diff --git a/src/gns/test_gns_gns2dns_cname_lookup.sh 
b/src/cli/gns/test_gns_gns2dns_cname_lookup.sh
similarity index 100%
rename from src/gns/test_gns_gns2dns_cname_lookup.sh
rename to src/cli/gns/test_gns_gns2dns_cname_lookup.sh
diff --git a/src/gns/test_gns_gns2dns_lookup.sh 
b/src/cli/gns/test_gns_gns2dns_lookup.sh
similarity index 100%
rename from src/gns/test_gns_gns2dns_lookup.sh
rename to src/cli/gns/test_gns_gns2dns_lookup.sh
diff --git a/src/gns/test_gns_gns2dns_zkey_lookup.sh 
b/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh
similarity index 100%
rename from src/gns/test_gns_gns2dns_zkey_lookup.sh
rename to src/cli/gns/test_gns_gns2dns_zkey_lookup.sh
diff --git a/src/gns/test_gns_ipv6_lookup.sh 
b/src/cli/gns/test_gns_ipv6_lookup.sh
similarity index 100%
rename from src/gns/test_gns_ipv6_lookup.sh
rename to src/cli/gns/test_gns_ipv6_lookup.sh
diff --git a/src/gns/test_gns_lookup.sh b/src/cli/gns/test_gns_lookup.sh
similarity index 100%
rename from src/gns/test_gns_lookup.sh
rename to src/cli/gns/test_gns_lookup.sh
diff --git a/src/gns/test_gns_multiple_record_lookup.sh 
b/src/cli/gns/test_gns_multiple_record_lookup.sh
similarity index 100%
rename from src/gns/test_gns_multiple_record_lookup.sh
rename to src/cli/gns/test_gns_multiple_record_lookup.sh
diff --git a/src/gns/test_gns_mx_lookup.sh b/src/cli/gns/test_gns_mx_lookup.sh
similarity index 100%
rename from src/gns/test_gns_mx_lookup.sh
rename to src/cli/gns/test_gns_mx_lookup.sh
diff --git a/src/gns/test_gns_quickupdate.sh 
b/src/cli/gns/test_gns_quickupdate.sh
similarity index 100%
rename from src/gns/test_gns_quickupdate.sh
rename to src/cli/gns/test_gns_quickupdate.sh
diff --git a/src/gns/test_gns_redirect_lookup.sh 
b/src/cli/gns/test_gns_redirect_lookup.sh
similarity index 100%
rename from src/gns/test_gns_redirect_lookup.sh
rename to src/cli/gns/test_gns_redirect_lookup.sh
diff --git a/src/gns/test_gns_rel_expiration.sh 
b/src/cli/gns/test_gns_rel_expiration.sh
similarity index 100%
rename from src/gns/test_gns_rel_expiration.sh
rename to src/cli/gns/test_gns_rel_expiration.sh
diff --git a/src/gns/test_gns_revocation.sh b/src/cli/gns/test_gns_revocation.sh
similarity index 100%
rename from src/gns/test_gns_revocation.sh
rename to src/cli/gns/test_gns_revocation.sh
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/cli/gns/test_gns_soa_lookup.sh
similarity index 100%
rename from src/gns/test_gns_soa_lookup.sh
rename to src/cli/gns/test_gns_soa_lookup.sh
diff --git a/src/gns/test_gns_txt_lookup.sh b/src/cli/gns/test_gns_txt_lookup.sh
similarity index 100%
rename from src/gns/test_gns_txt_lookup.sh
rename to src/cli/gns/test_gns_txt_lookup.sh
diff --git a/src/gns/test_gns_zkey_lookup.sh 
b/src/cli/gns/test_gns_zkey_lookup.sh
similarity index 100%
rename from src/gns/test_gns_zkey_lookup.sh
rename to src/cli/gns/test_gns_zkey_lookup.sh
diff --git a/src/cli/revocation/Makefile.am b/src/cli/revocation/Makefile.am
new file mode 100644
index 000000000..e4d6a6f35
--- /dev/null
+++ b/src/cli/revocation/Makefile.am
@@ -0,0 +1,52 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-revocation
+
+gnunet_revocation_SOURCES = \
+ gnunet-revocation.c
+gnunet_revocation_LDADD = \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_revocation_tvg_SOURCES = \
+ gnunet-revocation-tvg.c
+gnunet_revocation_tvg_LDADD = \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+noinst_PROGRAMS = \
+ gnunet-revocation-tvg
+
+check_SCRIPTS = \
+ #test_local_revocation.py
+
+if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
+ TESTS = \
+ $(check_SCRIPTS) \
+ $(check_PROGRAMS)
+endif
+
+test_local_revocation.py: test_local_revocation.py.in Makefile
+       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_local_revocation.py.in > test_local_revocation.py
+       chmod +x test_local_revocation.py
+
+EXTRA_DIST = test_revocation.conf \
+       test_local_revocation.py.in
diff --git a/src/revocation/gnunet-revocation-tvg.c 
b/src/cli/revocation/gnunet-revocation-tvg.c
similarity index 98%
rename from src/revocation/gnunet-revocation-tvg.c
rename to src/cli/revocation/gnunet-revocation-tvg.c
index b59b7ba62..7d354ed74 100644
--- a/src/revocation/gnunet-revocation-tvg.c
+++ b/src/cli/revocation/gnunet-revocation-tvg.c
@@ -28,7 +28,8 @@
 #include "gnunet_signatures.h"
 #include "gnunet_revocation_service.h"
 #include "gnunet_testing_lib.h"
-#include "revocation.h"
+// FIXME try to avoid this include somehow
+#include "../../service/revocation/revocation.h"
 #include <inttypes.h>
 
 #define TEST_EPOCHS 2
diff --git a/src/revocation/gnunet-revocation.c 
b/src/cli/revocation/gnunet-revocation.c
similarity index 100%
rename from src/revocation/gnunet-revocation.c
rename to src/cli/revocation/gnunet-revocation.c
diff --git a/src/revocation/test_local_revocation.py.in 
b/src/cli/revocation/test_local_revocation.py.in
similarity index 100%
rename from src/revocation/test_local_revocation.py.in
rename to src/cli/revocation/test_local_revocation.py.in
diff --git a/src/cli/vpn/.gitignore b/src/cli/vpn/.gitignore
new file mode 100644
index 000000000..dbd75eb25
--- /dev/null
+++ b/src/cli/vpn/.gitignore
@@ -0,0 +1 @@
+gnunet-vpn
diff --git a/src/cli/datastore/Makefile.am b/src/cli/vpn/Makefile.am
similarity index 56%
copy from src/cli/datastore/Makefile.am
copy to src/cli/vpn/Makefile.am
index 91098db96..0c7c459ef 100644
--- a/src/cli/datastore/Makefile.am
+++ b/src/cli/vpn/Makefile.am
@@ -1,24 +1,22 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
-plugindir = $(libdir)/gnunet
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
+plugindir = $(libdir)/gnunet
 
 bin_PROGRAMS = \
- gnunet-datastore
+  gnunet-vpn
 
-gnunet_datastore_SOURCES = \
- gnunet-datastore.c
-gnunet_datastore_LDADD = \
-  $(top_builddir)/src/service/datastore/libgnunetdatastore.la \
+gnunet_vpn_SOURCES = \
+ gnunet-vpn.c
+gnunet_vpn_LDADD = \
+  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL)
diff --git a/src/vpn/gnunet-vpn.c b/src/cli/vpn/gnunet-vpn.c
similarity index 100%
rename from src/vpn/gnunet-vpn.c
rename to src/cli/vpn/gnunet-vpn.c
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
index cfab56206..2d365106b 100644
--- a/src/contrib/service/Makefile.am
+++ b/src/contrib/service/Makefile.am
@@ -5,9 +5,19 @@ if HAVE_EXPERIMENTAL
   auction
 endif
 
+if BUILD_PULSE_HELPERS
+CONVERSATION_DIR = conversation
+else
+if BUILD_GST_HELPERS
+CONVERSATION_DIR = conversation
+endif
+endif
+
 SUBDIRS = \
        template \
        set \
        consensus \
        secretsharing \
+       scalarproduct \
+  $(CONVERSATION_DIR) \
        $(EXP_DIR)
diff --git a/src/contrib/service/abd/Makefile.am 
b/src/contrib/service/abd/Makefile.am
index d08a6a4a7..f199d72ed 100644
--- a/src/contrib/service/abd/Makefile.am
+++ b/src/contrib/service/abd/Makefile.am
@@ -65,7 +65,7 @@ gnunet_service_abd_SOURCES = \
 gnunet_service_abd_LDADD = \
        libgnunetabd.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-       $(top_builddir)/src/gns/libgnunetgns.la \
+       $(top_builddir)/src/service/gns/libgnunetgns.la \
        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
diff --git a/src/conversation/.gitignore 
b/src/contrib/service/conversation/.gitignore
similarity index 100%
rename from src/conversation/.gitignore
rename to src/contrib/service/conversation/.gitignore
diff --git a/src/conversation/Makefile.am 
b/src/contrib/service/conversation/Makefile.am
similarity index 98%
rename from src/conversation/Makefile.am
rename to src/contrib/service/conversation/Makefile.am
index 720d543ca..b573208e6 100644
--- a/src/conversation/Makefile.am
+++ b/src/contrib/service/conversation/Makefile.am
@@ -69,7 +69,7 @@ libgnunetconversation_la_SOURCES = \
   conversation_api_call.c \
   conversation.h
 libgnunetconversation_la_LIBADD = \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
@@ -196,7 +196,7 @@ gnunet_conversation_LDADD = \
   libgnunetmicrophone.la \
   libgnunetspeaker.la \
   libgnunetconversation.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
diff --git a/src/conversation/build_gst_test.sh 
b/src/contrib/service/conversation/build_gst_test.sh
similarity index 100%
rename from src/conversation/build_gst_test.sh
rename to src/contrib/service/conversation/build_gst_test.sh
diff --git a/src/conversation/conversation.conf.in 
b/src/contrib/service/conversation/conversation.conf.in
similarity index 100%
rename from src/conversation/conversation.conf.in
rename to src/contrib/service/conversation/conversation.conf.in
diff --git a/src/conversation/conversation.h 
b/src/contrib/service/conversation/conversation.h
similarity index 100%
rename from src/conversation/conversation.h
rename to src/contrib/service/conversation/conversation.h
diff --git a/src/conversation/conversation_api.c 
b/src/contrib/service/conversation/conversation_api.c
similarity index 100%
rename from src/conversation/conversation_api.c
rename to src/contrib/service/conversation/conversation_api.c
diff --git a/src/conversation/conversation_api_call.c 
b/src/contrib/service/conversation/conversation_api_call.c
similarity index 100%
rename from src/conversation/conversation_api_call.c
rename to src/contrib/service/conversation/conversation_api_call.c
diff --git a/src/conversation/displaydot.sh 
b/src/contrib/service/conversation/displaydot.sh
similarity index 100%
rename from src/conversation/displaydot.sh
rename to src/contrib/service/conversation/displaydot.sh
diff --git a/src/conversation/gnunet-conversation-test.c 
b/src/contrib/service/conversation/gnunet-conversation-test.c
similarity index 100%
rename from src/conversation/gnunet-conversation-test.c
rename to src/contrib/service/conversation/gnunet-conversation-test.c
diff --git a/src/conversation/gnunet-conversation.c 
b/src/contrib/service/conversation/gnunet-conversation.c
similarity index 100%
rename from src/conversation/gnunet-conversation.c
rename to src/contrib/service/conversation/gnunet-conversation.c
diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c 
b/src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-playback-gst.c
rename to src/contrib/service/conversation/gnunet-helper-audio-playback-gst.c
diff --git a/src/conversation/gnunet-helper-audio-playback.c 
b/src/contrib/service/conversation/gnunet-helper-audio-playback.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-playback.c
rename to src/contrib/service/conversation/gnunet-helper-audio-playback.c
diff --git a/src/conversation/gnunet-helper-audio-record-gst.c 
b/src/contrib/service/conversation/gnunet-helper-audio-record-gst.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-record-gst.c
rename to src/contrib/service/conversation/gnunet-helper-audio-record-gst.c
diff --git a/src/conversation/gnunet-helper-audio-record.c 
b/src/contrib/service/conversation/gnunet-helper-audio-record.c
similarity index 100%
rename from src/conversation/gnunet-helper-audio-record.c
rename to src/contrib/service/conversation/gnunet-helper-audio-record.c
diff --git a/src/conversation/gnunet-service-conversation.c 
b/src/contrib/service/conversation/gnunet-service-conversation.c
similarity index 100%
rename from src/conversation/gnunet-service-conversation.c
rename to src/contrib/service/conversation/gnunet-service-conversation.c
diff --git a/src/conversation/gnunet_gst.c 
b/src/contrib/service/conversation/gnunet_gst.c
similarity index 100%
rename from src/conversation/gnunet_gst.c
rename to src/contrib/service/conversation/gnunet_gst.c
diff --git a/src/conversation/gnunet_gst.h 
b/src/contrib/service/conversation/gnunet_gst.h
similarity index 100%
rename from src/conversation/gnunet_gst.h
rename to src/contrib/service/conversation/gnunet_gst.h
diff --git a/src/conversation/gnunet_gst_def.h 
b/src/contrib/service/conversation/gnunet_gst_def.h
similarity index 100%
rename from src/conversation/gnunet_gst_def.h
rename to src/contrib/service/conversation/gnunet_gst_def.h
diff --git a/src/conversation/gnunet_gst_test.c 
b/src/contrib/service/conversation/gnunet_gst_test.c
similarity index 100%
rename from src/conversation/gnunet_gst_test.c
rename to src/contrib/service/conversation/gnunet_gst_test.c
diff --git a/src/conversation/mediahelper.conf 
b/src/contrib/service/conversation/mediahelper.conf
similarity index 100%
rename from src/conversation/mediahelper.conf
rename to src/contrib/service/conversation/mediahelper.conf
diff --git a/src/conversation/meson.build 
b/src/contrib/service/conversation/meson.build
similarity index 100%
rename from src/conversation/meson.build
rename to src/contrib/service/conversation/meson.build
diff --git a/src/conversation/microphone.c 
b/src/contrib/service/conversation/microphone.c
similarity index 100%
rename from src/conversation/microphone.c
rename to src/contrib/service/conversation/microphone.c
diff --git a/src/conversation/plugin_gnsrecord_conversation.c 
b/src/contrib/service/conversation/plugin_gnsrecord_conversation.c
similarity index 100%
rename from src/conversation/plugin_gnsrecord_conversation.c
rename to src/contrib/service/conversation/plugin_gnsrecord_conversation.c
diff --git a/src/conversation/speaker.c 
b/src/contrib/service/conversation/speaker.c
similarity index 100%
rename from src/conversation/speaker.c
rename to src/contrib/service/conversation/speaker.c
diff --git a/src/conversation/test.sh b/src/contrib/service/conversation/test.sh
similarity index 100%
rename from src/conversation/test.sh
rename to src/contrib/service/conversation/test.sh
diff --git a/src/conversation/test_conversation.conf 
b/src/contrib/service/conversation/test_conversation.conf
similarity index 100%
rename from src/conversation/test_conversation.conf
rename to src/contrib/service/conversation/test_conversation.conf
diff --git a/src/conversation/test_conversation_api.c 
b/src/contrib/service/conversation/test_conversation_api.c
similarity index 100%
rename from src/conversation/test_conversation_api.c
rename to src/contrib/service/conversation/test_conversation_api.c
diff --git a/src/conversation/test_conversation_api_reject.c 
b/src/contrib/service/conversation/test_conversation_api_reject.c
similarity index 100%
rename from src/conversation/test_conversation_api_reject.c
rename to src/contrib/service/conversation/test_conversation_api_reject.c
diff --git a/src/conversation/test_conversation_api_twocalls.c 
b/src/contrib/service/conversation/test_conversation_api_twocalls.c
similarity index 100%
rename from src/conversation/test_conversation_api_twocalls.c
rename to src/contrib/service/conversation/test_conversation_api_twocalls.c
diff --git a/src/scalarproduct/.gitignore 
b/src/contrib/service/scalarproduct/.gitignore
similarity index 100%
rename from src/scalarproduct/.gitignore
rename to src/contrib/service/scalarproduct/.gitignore
diff --git a/src/scalarproduct/Makefile.am 
b/src/contrib/service/scalarproduct/Makefile.am
similarity index 93%
rename from src/scalarproduct/Makefile.am
rename to src/contrib/service/scalarproduct/Makefile.am
index 77a17ec20..4de1f5032 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/contrib/service/scalarproduct/Makefile.am
@@ -39,7 +39,7 @@ gnunet_service_scalarproduct_alice_SOURCES = \
 gnunet_service_scalarproduct_alice_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
@@ -50,7 +50,7 @@ gnunet_service_scalarproduct_bob_SOURCES = \
 gnunet_service_scalarproduct_bob_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lgcrypt \
   $(GN_LIBINTL)
@@ -61,7 +61,7 @@ gnunet_service_scalarproduct_ecc_alice_SOURCES = \
 gnunet_service_scalarproduct_ecc_alice_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lsodium \
   -lgcrypt \
@@ -73,7 +73,7 @@ gnunet_service_scalarproduct_ecc_bob_SOURCES = \
 gnunet_service_scalarproduct_ecc_bob_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/seti/libgnunetseti.la \
+  $(top_builddir)/src/service/seti/libgnunetseti.la \
   $(LIBGCRYPT_LIBS) \
   -lsodium \
   -lgcrypt \
diff --git a/src/scalarproduct/gnunet-scalarproduct.c 
b/src/contrib/service/scalarproduct/gnunet-scalarproduct.c
similarity index 100%
rename from src/scalarproduct/gnunet-scalarproduct.c
rename to src/contrib/service/scalarproduct/gnunet-scalarproduct.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h 
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc.h
similarity index 100%
rename from src/scalarproduct/gnunet-service-scalarproduct-ecc.h
rename to src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc.h
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c 
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
similarity index 100%
rename from src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
rename to 
src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c 
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
similarity index 100%
rename from src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
rename to 
src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct.h 
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct.h
similarity index 100%
rename from src/scalarproduct/gnunet-service-scalarproduct.h
rename to src/contrib/service/scalarproduct/gnunet-service-scalarproduct.h
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c 
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
similarity index 100%
rename from src/scalarproduct/gnunet-service-scalarproduct_alice.c
rename to src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c 
b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
similarity index 100%
rename from src/scalarproduct/gnunet-service-scalarproduct_bob.c
rename to src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
diff --git a/src/scalarproduct/meson.build 
b/src/contrib/service/scalarproduct/meson.build
similarity index 100%
rename from src/scalarproduct/meson.build
rename to src/contrib/service/scalarproduct/meson.build
diff --git a/src/scalarproduct/perf_scalarproduct.sh 
b/src/contrib/service/scalarproduct/perf_scalarproduct.sh
similarity index 100%
rename from src/scalarproduct/perf_scalarproduct.sh
rename to src/contrib/service/scalarproduct/perf_scalarproduct.sh
diff --git a/src/scalarproduct/scalarproduct.conf.in 
b/src/contrib/service/scalarproduct/scalarproduct.conf.in
similarity index 100%
rename from src/scalarproduct/scalarproduct.conf.in
rename to src/contrib/service/scalarproduct/scalarproduct.conf.in
diff --git a/src/scalarproduct/scalarproduct.h 
b/src/contrib/service/scalarproduct/scalarproduct.h
similarity index 100%
rename from src/scalarproduct/scalarproduct.h
rename to src/contrib/service/scalarproduct/scalarproduct.h
diff --git a/src/scalarproduct/scalarproduct_api.c 
b/src/contrib/service/scalarproduct/scalarproduct_api.c
similarity index 100%
rename from src/scalarproduct/scalarproduct_api.c
rename to src/contrib/service/scalarproduct/scalarproduct_api.c
diff --git a/src/scalarproduct/test_ecc_scalarproduct.c 
b/src/contrib/service/scalarproduct/test_ecc_scalarproduct.c
similarity index 100%
rename from src/scalarproduct/test_ecc_scalarproduct.c
rename to src/contrib/service/scalarproduct/test_ecc_scalarproduct.c
diff --git a/src/scalarproduct/test_scalarproduct.conf 
b/src/contrib/service/scalarproduct/test_scalarproduct.conf
similarity index 100%
rename from src/scalarproduct/test_scalarproduct.conf
rename to src/contrib/service/scalarproduct/test_scalarproduct.conf
diff --git a/src/scalarproduct/test_scalarproduct.sh 
b/src/contrib/service/scalarproduct/test_scalarproduct.sh
similarity index 100%
rename from src/scalarproduct/test_scalarproduct.sh
rename to src/contrib/service/scalarproduct/test_scalarproduct.sh
diff --git a/src/scalarproduct/test_scalarproduct_negative.sh 
b/src/contrib/service/scalarproduct/test_scalarproduct_negative.sh
similarity index 100%
rename from src/scalarproduct/test_scalarproduct_negative.sh
rename to src/contrib/service/scalarproduct/test_scalarproduct_negative.sh
diff --git a/src/scalarproduct/test_scalarproduct_negativezero.sh 
b/src/contrib/service/scalarproduct/test_scalarproduct_negativezero.sh
similarity index 100%
rename from src/scalarproduct/test_scalarproduct_negativezero.sh
rename to src/contrib/service/scalarproduct/test_scalarproduct_negativezero.sh
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
deleted file mode 100644
index 08d85c903..000000000
--- a/src/gns/Makefile.am
+++ /dev/null
@@ -1,306 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if HAVE_GLIBCNSS
-NSS_SUBDIR = nss
-endif
-
-SUBDIRS = . $(NSS_SUBDIR)
-
-pkgdata_DATA = \
-  gnunet-gns-proxy-ca.template
-
-if HAVE_LIBIDN
-  LIBIDN= -lidn
-else
-  LIBIDN=
-endif
-
-if HAVE_LIBIDN2
-  LIBIDN2= -lidn2
-else
-  LIBIDN2=
-endif
-
-USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-endif
-
-pkgcfgdir = $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugindir = $(libdir)/gnunet
-
-pkgcfg_DATA = \
-  gns.conf
-dist_pkgcfg_DATA = \
-  tlds.conf
-
-lib_LTLIBRARIES = \
-  libgnunetgns.la
-
-libexec_PROGRAMS = \
-  gnunet-service-gns \
-  gnunet-dns2gns
-
-bin_PROGRAMS = \
-  gnunet-gns
-
-noinst_PROGRAMS = \
-  gnunet-gns-benchmark
-
-if HAVE_PDFLATEX
-libexec_PROGRAMS += gnunet-bcd
-endif
-
-if HAVE_GNUTLS
-libexec_PROGRAMS += gnunet-gns-proxy
-endif
-
-REST_PLUGIN = libgnunet_plugin_rest_gns.la
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_gns.la \
-  libgnunet_plugin_gnsrecord_gns.la \
-  $(REST_PLUGIN)
-
-
-bin_SCRIPTS = \
-  gnunet-gns-proxy-setup-ca
-
-gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile
-       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca
-       @chmod +x gnunet-gns-proxy-setup-ca
-
-test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile
-       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh
-       @chmod +x test_gnunet_gns.sh
-
-CLEANFILES = test_gnunet_gns.sh
-
-libgnunet_plugin_rest_gns_la_SOURCES = \
-  plugin_rest_gns.c
-libgnunet_plugin_rest_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_gns_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
-  plugin_gnsrecord_gns.c
-libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-gnunet_gns_SOURCES = \
- gnunet-gns.c
-gnunet_gns_LDADD = \
-  libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LIBIDN) $(LIBIDN2) \
-  $(GN_LIBINTL)
-
-gnunet_gns_benchmark_SOURCES = \
- gnunet-gns-benchmark.c
-gnunet_gns_benchmark_LDADD = \
-  libgnunetgns.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-
-gnunet_bcd_SOURCES = \
- gnunet-bcd.c
-gnunet_bcd_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL) $(MHD_LIBS)
-gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-gnunet_dns2gns_SOURCES = \
- gnunet-dns2gns.c
-gnunet_dns2gns_LDADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetgns.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(USE_VPN) \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(GN_LIBINTL)
-
-if HAVE_SUDO
-SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -n
-else
-if HAVE_DOAS_BINARY
-SUDO_OR_DOAS_BINARY= $(DOAS_BINARY)
-endif
-endif
-
-if LINUX
-HIJACKBIN = gnunet-dns2gns
-install-exec-hook:
-       $(SUDO_OR_DOAS_BINARY) setcap 'cap_net_bind_service=+ep' 
$(DESTDIR)$(libexecdir)/gnunet-dns2gns || true
-else
-install-exec-hook:
-endif
-
-gnunet_gns_proxy_SOURCES = \
- gnunet-gns-proxy.c
-gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
-  libgnunetgns.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-if HAVE_GNUTLS_DANE
-gnunet_gns_proxy_LDADD += -lgnutls-dane
-endif
-gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-test_gns_proxy_SOURCES = \
-  test_gns_proxy.c
-test_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
-
-#gnunet_gns_import_SOURCES = \
-#  gnunet-gns-import.c
-#gnunet_gns_import_LDADD = \
-#  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-#  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-#  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-#  $(top_builddir)/src/lib/util/libgnunetutil.la \
-#  $(GN_LIBINTL)
-
-
-gnunet_service_gns_SOURCES = \
- gnunet-service-gns.c gnunet-service-gns.h \
- gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
- gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h
-gnunet_service_gns_LDADD = \
-  -lm \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/revocation/libgnunetrevocation.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/dns/libgnunetdns.la \
-  $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(LIBIDN) $(LIBIDN2) \
-  $(GN_LIBINTL)
-
-
-libgnunetgns_la_SOURCES = \
- gns_api.c gns_api.h \
- gns_tld_api.c gns.h
-libgnunetgns_la_LIBADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
-libgnunetgns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_LIB_LDFLAGS)
-
-
-libgnunet_plugin_block_gns_la_SOURCES = \
-  plugin_block_gns.c
-libgnunet_plugin_block_gns_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
-libgnunet_plugin_block_gns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(GN_PLUGIN_LDFLAGS)
-
-if HAVE_GNUTLS
-check_PROGRAMS = \
-  test_gns_proxy
-endif
-
-check_SCRIPTS = \
-   test_gns_lookup.sh \
-   test_gns_config_lookup.sh \
-   test_gns_ipv6_lookup.sh\
-   test_gns_txt_lookup.sh\
-   test_gns_caa_lookup.sh\
-   test_gns_mx_lookup.sh \
-   test_gns_gns2dns_lookup.sh \
-   test_gns_gns2dns_zkey_lookup.sh \
-   test_gns_gns2dns_cname_lookup.sh \
-   test_gns_dht_lookup.sh\
-   test_gns_delegated_lookup.sh \
-   test_gns_at_lookup.sh\
-   test_gns_zkey_lookup.sh\
-   test_gns_rel_expiration.sh\
-   test_gns_soa_lookup.sh\
-   test_gns_revocation.sh\
-   test_gns_redirect_lookup.sh
-
-if HAVE_GNUTLS_CURL
-check_SCRIPTS += \
-  test_proxy.sh
-endif
-check_SCRIPTS += \
-  test_plugin_rest_gns.sh
-
-EXTRA_DIST = \
-  test_gns_defaults.conf \
-  test_gns_lookup.conf \
-  test_gns_proxy.conf \
-  test_gns_simple_lookup.conf \
-  openssl.cnf \
-  gnunet-gns-proxy-setup-ca.in \
-  zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \
-  zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \
-  zonefiles/test_zonekey \
-  test_gns_lookup.sh \
-  test_gns_config_lookup.sh \
-  test_gns_ipv6_lookup.sh\
-  test_gns_txt_lookup.sh\
-  test_gns_caa_lookup.sh\
-  test_gns_mx_lookup.sh \
-  test_gns_gns2dns_lookup.sh \
-  test_gns_gns2dns_zkey_lookup.sh \
-  test_gns_gns2dns_cname_lookup.sh \
-  test_gns_dht_lookup.sh\
-  test_gns_delegated_lookup.sh \
-  test_gns_at_lookup.sh\
-  test_gns_zkey_lookup.sh\
-  test_gns_rel_expiration.sh\
-  test_gns_soa_lookup.sh\
-  test_gns_revocation.sh\
-  test_gns_redirect_lookup.sh\
-  test_proxy.sh\
-  test_plugin_rest_gns.sh\
-  test_proxy.sh \
-  $(pkgdata_DATA) \
-  test_gnunet_gns.sh.in
-
-if ENABLE_TEST_RUN
-if HAVE_SQLITE
- AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
- TESTS = $(check_SCRIPTS)
-endif
-endif
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 62036f206..5b1464d89 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -3,4 +3,6 @@ SUBDIRS = \
        gnsrecord \
        dhtu \
        namecache \
-       namestore
+       namestore \
+       revocation \
+       gns
diff --git a/src/plugin/gns/Makefile.am b/src/plugin/gns/Makefile.am
new file mode 100644
index 000000000..ebbb9aa51
--- /dev/null
+++ b/src/plugin/gns/Makefile.am
@@ -0,0 +1,61 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if HAVE_LIBIDN
+  LIBIDN= -lidn
+else
+  LIBIDN=
+endif
+
+if HAVE_LIBIDN2
+  LIBIDN2= -lidn2
+else
+  LIBIDN2=
+endif
+
+USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir = $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_gns.la \
+  libgnunet_plugin_gnsrecord_gns.la
+
+
+libgnunet_plugin_gnsrecord_gns_la_SOURCES = \
+  plugin_gnsrecord_gns.c
+libgnunet_plugin_gnsrecord_gns_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_gns_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_block_gns_la_SOURCES = \
+  plugin_block_gns.c
+libgnunet_plugin_block_gns_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
+libgnunet_plugin_block_gns_la_LDFLAGS = \
+  $(GN_LIBINTL) \
+  $(GN_PLUGIN_LDFLAGS)
+
+if ENABLE_TEST_RUN
+if HAVE_SQLITE
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
+ TESTS = $(check_SCRIPTS)
+endif
+endif
diff --git a/src/gns/plugin_block_gns.c b/src/plugin/gns/plugin_block_gns.c
similarity index 100%
rename from src/gns/plugin_block_gns.c
rename to src/plugin/gns/plugin_block_gns.c
diff --git a/src/gns/plugin_gnsrecord_gns.c 
b/src/plugin/gns/plugin_gnsrecord_gns.c
similarity index 100%
rename from src/gns/plugin_gnsrecord_gns.c
rename to src/plugin/gns/plugin_gnsrecord_gns.c
diff --git a/src/plugin/revocation/Makefile.am 
b/src/plugin/revocation/Makefile.am
new file mode 100644
index 000000000..db6df02c9
--- /dev/null
+++ b/src/plugin/revocation/Makefile.am
@@ -0,0 +1,28 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_revocation.la
+
+libgnunet_plugin_block_revocation_la_SOURCES = \
+  plugin_block_revocation.c
+libgnunet_plugin_block_revocation_la_LIBADD = \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la  \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
+  $(LTLIBINTL)
+libgnunet_plugin_block_revocation_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/revocation/plugin_block_revocation.c 
b/src/plugin/revocation/plugin_block_revocation.c
similarity index 98%
rename from src/revocation/plugin_block_revocation.c
rename to src/plugin/revocation/plugin_block_revocation.c
index 9686f23ff..4c5991507 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/plugin/revocation/plugin_block_revocation.c
@@ -28,7 +28,8 @@
 #include "gnunet_signatures.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
-#include "revocation.h"
+// FIXME try to avoid this include somehow
+#include "../../service/revocation/revocation.h"
 #include "gnunet_revocation_service.h"
 
 #define DEBUG_REVOCATION GNUNET_EXTRA_LOGGING
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 5ecaaa10c..7622f2c1a 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -20,7 +20,7 @@ libexec_PROGRAMS = \
 gnunet_daemon_pt_SOURCES = \
  gnunet-daemon-pt.c
 gnunet_daemon_pt_LDADD = \
-  $(top_builddir)/src/vpn/libgnunetvpn.la \
+  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
   $(top_builddir)/src/service/dns/libgnunetdns.la \
@@ -63,7 +63,7 @@ test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ 
$(AM_CFLAGS)
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -71,7 +71,7 @@ test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) 
@LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -79,7 +79,7 @@ test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) 
@LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -87,7 +87,7 @@ test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) 
@LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 406aad081..e5603d662 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -80,7 +80,7 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
   libgnunetreclaim.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
   $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson -ljose $(MHD_LIBS) \
@@ -126,7 +126,7 @@ gnunet_service_reclaim_LDADD = \
  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
  libgnunetreclaim.la \
- $(top_builddir)/src/gns/libgnunetgns.la \
+ $(top_builddir)/src/service/gns/libgnunetgns.la \
  $(GN_LIBINTL)
 
 libgnunetreclaim_la_SOURCES = \
@@ -151,7 +151,7 @@ libgnunetdid_la_SOURCES = \
   did_core.c
 libgnunetdid_la_LIBADD = \
        $(top_builddir)/src/lib/util/libgnunetutil.la \
-       $(top_builddir)/src/gns/libgnunetgns.la \
+       $(top_builddir)/src/service/gns/libgnunetgns.la \
        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
        $(top_builddir)/src/service/identity/libgnunetidentity.la \
        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
@@ -216,7 +216,7 @@ gnunet_did_SOURCES = \
        gnunet-did.c
 gnunet_did_LDADD = \
        $(top_builddir)/src/lib/util/libgnunetutil.la \
-       $(top_builddir)/src/gns/libgnunetgns.la \
+       $(top_builddir)/src/service/gns/libgnunetgns.la \
        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
        $(top_builddir)/src/service/identity/libgnunetidentity.la \
        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
@@ -228,7 +228,7 @@ test_did_helper_SOURCES = \
   test_did_helper.c
 test_did_helper_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-       $(top_builddir)/src/gns/libgnunetgns.la \
+       $(top_builddir)/src/service/gns/libgnunetgns.la \
        $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
        $(top_builddir)/src/service/identity/libgnunetidentity.la \
        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am
index fb74b9f2e..4b1b71bb7 100644
--- a/src/rest-plugin/Makefile.am
+++ b/src/rest-plugin/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = \
        rest \
-       identity
+       identity \
+       gns
diff --git a/src/rest-plugin/gns/Makefile.am b/src/rest-plugin/gns/Makefile.am
new file mode 100644
index 000000000..48b278df6
--- /dev/null
+++ b/src/rest-plugin/gns/Makefile.am
@@ -0,0 +1,61 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if HAVE_LIBIDN
+  LIBIDN= -lidn
+else
+  LIBIDN=
+endif
+
+if HAVE_LIBIDN2
+  LIBIDN2= -lidn2
+else
+  LIBIDN2=
+endif
+
+USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir = $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+REST_PLUGIN = libgnunet_plugin_rest_gns.la
+
+plugin_LTLIBRARIES = \
+  $(REST_PLUGIN)
+
+
+libgnunet_plugin_rest_gns_la_SOURCES = \
+  plugin_rest_gns.c
+libgnunet_plugin_rest_gns_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/rest/libgnunetrest.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL) -ljansson $(MHD_LIBS)
+libgnunet_plugin_rest_gns_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+libgnunet_plugin_rest_gns_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+
+
+check_SCRIPTS = \
+  test_plugin_rest_gns.sh
+
+EXTRA_DIST = \
+  test_plugin_rest_gns.sh
+
+if ENABLE_TEST_RUN
+if HAVE_SQLITE
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
+ TESTS = $(check_SCRIPTS)
+endif
+endif
diff --git a/src/gns/plugin_rest_gns.c b/src/rest-plugin/gns/plugin_rest_gns.c
similarity index 100%
rename from src/gns/plugin_rest_gns.c
rename to src/rest-plugin/gns/plugin_rest_gns.c
diff --git a/src/gns/test_plugin_rest_gns.sh 
b/src/rest-plugin/gns/test_plugin_rest_gns.sh
similarity index 100%
rename from src/gns/test_plugin_rest_gns.sh
rename to src/rest-plugin/gns/test_plugin_rest_gns.sh
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 636caa985..34ae7945f 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -19,5 +19,12 @@ SUBDIRS = \
        dht \
   namecache \
   namestore \
+       cadet \
+  seti \
+  setu \
   regex \
-       cadet
+  revocation \
+       vpn \
+  gns \
+  zonemaster
+
diff --git a/src/gns/.gitignore b/src/service/gns/.gitignore
similarity index 100%
rename from src/gns/.gitignore
rename to src/service/gns/.gitignore
diff --git a/src/service/gns/Makefile.am b/src/service/gns/Makefile.am
new file mode 100644
index 000000000..a169b43a6
--- /dev/null
+++ b/src/service/gns/Makefile.am
@@ -0,0 +1,180 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if HAVE_GLIBCNSS
+NSS_SUBDIR = nss
+endif
+
+SUBDIRS = . $(NSS_SUBDIR)
+
+if HAVE_LIBIDN
+  LIBIDN= -lidn
+else
+  LIBIDN=
+endif
+
+if HAVE_LIBIDN2
+  LIBIDN2= -lidn2
+else
+  LIBIDN2=
+endif
+
+USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir = $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+pkgcfg_DATA = \
+  gns.conf
+dist_pkgcfg_DATA = \
+  tlds.conf
+
+lib_LTLIBRARIES = \
+  libgnunetgns.la
+
+libexec_PROGRAMS = \
+  gnunet-service-gns \
+  gnunet-dns2gns
+
+noinst_PROGRAMS = \
+  gnunet-gns-benchmark
+
+if HAVE_PDFLATEX
+libexec_PROGRAMS += gnunet-bcd
+endif
+
+if HAVE_GNUTLS
+libexec_PROGRAMS += gnunet-gns-proxy
+endif
+
+gnunet_gns_benchmark_SOURCES = \
+ gnunet-gns-benchmark.c
+gnunet_gns_benchmark_LDADD = \
+  libgnunetgns.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+
+gnunet_bcd_SOURCES = \
+ gnunet-bcd.c
+gnunet_bcd_LDADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(GN_LIBINTL) $(MHD_LIBS)
+gnunet_bcd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+
+
+gnunet_dns2gns_SOURCES = \
+ gnunet-dns2gns.c
+gnunet_dns2gns_LDADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  libgnunetgns.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(USE_VPN) \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(GN_LIBINTL)
+
+if HAVE_SUDO
+SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) -n
+else
+if HAVE_DOAS_BINARY
+SUDO_OR_DOAS_BINARY= $(DOAS_BINARY)
+endif
+endif
+
+if LINUX
+HIJACKBIN = gnunet-dns2gns
+install-exec-hook:
+       $(SUDO_OR_DOAS_BINARY) setcap 'cap_net_bind_service=+ep' 
$(DESTDIR)$(libexecdir)/gnunet-dns2gns || true
+else
+install-exec-hook:
+endif
+
+gnunet_gns_proxy_SOURCES = \
+ gnunet-gns-proxy.c
+gnunet_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
+  libgnunetgns.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+if HAVE_GNUTLS_DANE
+gnunet_gns_proxy_LDADD += -lgnutls-dane
+endif
+gnunet_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
+
+test_gns_proxy_SOURCES = \
+  test_gns_proxy.c
+test_gns_proxy_LDADD = $(MHD_LIBS) @LIBCURL@ -lgnutls \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
+
+#gnunet_gns_import_SOURCES = \
+#  gnunet-gns-import.c
+#gnunet_gns_import_LDADD = \
+#  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+#  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+#  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+#  $(top_builddir)/src/lib/util/libgnunetutil.la \
+#  $(GN_LIBINTL)
+
+
+gnunet_service_gns_SOURCES = \
+ gnunet-service-gns.c gnunet-service-gns.h \
+ gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
+ gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h
+gnunet_service_gns_LDADD = \
+  -lm \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/dns/libgnunetdns.la \
+  $(top_builddir)/src/service/dht/libgnunetdht.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(LIBIDN) $(LIBIDN2) \
+  $(GN_LIBINTL)
+
+
+libgnunetgns_la_SOURCES = \
+ gns_api.c gns_api.h \
+ gns_tld_api.c gns.h
+libgnunetgns_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIB) \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la
+libgnunetgns_la_LDFLAGS = \
+  $(GN_LIBINTL) \
+  $(GN_LIB_LDFLAGS)
+
+
+if HAVE_GNUTLS
+check_PROGRAMS = \
+  test_gns_proxy
+endif
+
+if HAVE_GNUTLS_CURL
+check_SCRIPTS = \
+  test_proxy.sh
+endif
+
+EXTRA_DIST = \
+  test_gns_proxy.conf \
+  test_proxy.sh
+
+if ENABLE_TEST_RUN
+if HAVE_SQLITE
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
+ TESTS = $(check_SCRIPTS)
+endif
+endif
diff --git a/src/gns/gns.conf.in b/src/service/gns/gns.conf.in
similarity index 100%
rename from src/gns/gns.conf.in
rename to src/service/gns/gns.conf.in
diff --git a/src/gns/gns.h b/src/service/gns/gns.h
similarity index 100%
rename from src/gns/gns.h
rename to src/service/gns/gns.h
diff --git a/src/gns/gns_api.c b/src/service/gns/gns_api.c
similarity index 100%
rename from src/gns/gns_api.c
rename to src/service/gns/gns_api.c
diff --git a/src/gns/gns_api.h b/src/service/gns/gns_api.h
similarity index 100%
rename from src/gns/gns_api.h
rename to src/service/gns/gns_api.h
diff --git a/src/gns/gns_tld_api.c b/src/service/gns/gns_tld_api.c
similarity index 100%
rename from src/gns/gns_tld_api.c
rename to src/service/gns/gns_tld_api.c
diff --git a/src/gns/gnunet-bcd.c b/src/service/gns/gnunet-bcd.c
similarity index 100%
rename from src/gns/gnunet-bcd.c
rename to src/service/gns/gnunet-bcd.c
diff --git a/src/gns/gnunet-dns2gns.c b/src/service/gns/gnunet-dns2gns.c
similarity index 100%
rename from src/gns/gnunet-dns2gns.c
rename to src/service/gns/gnunet-dns2gns.c
diff --git a/src/gns/gnunet-gns-benchmark.c 
b/src/service/gns/gnunet-gns-benchmark.c
similarity index 100%
rename from src/gns/gnunet-gns-benchmark.c
rename to src/service/gns/gnunet-gns-benchmark.c
diff --git a/src/gns/gnunet-gns-import.c b/src/service/gns/gnunet-gns-import.c
similarity index 100%
rename from src/gns/gnunet-gns-import.c
rename to src/service/gns/gnunet-gns-import.c
diff --git a/src/gns/gnunet-gns-proxy.c b/src/service/gns/gnunet-gns-proxy.c
similarity index 100%
rename from src/gns/gnunet-gns-proxy.c
rename to src/service/gns/gnunet-gns-proxy.c
diff --git a/src/gns/gnunet-service-gns.c b/src/service/gns/gnunet-service-gns.c
similarity index 100%
rename from src/gns/gnunet-service-gns.c
rename to src/service/gns/gnunet-service-gns.c
diff --git a/src/gns/gnunet-service-gns.h b/src/service/gns/gnunet-service-gns.h
similarity index 100%
rename from src/gns/gnunet-service-gns.h
rename to src/service/gns/gnunet-service-gns.h
diff --git a/src/gns/gnunet-service-gns_interceptor.c 
b/src/service/gns/gnunet-service-gns_interceptor.c
similarity index 100%
rename from src/gns/gnunet-service-gns_interceptor.c
rename to src/service/gns/gnunet-service-gns_interceptor.c
diff --git a/src/gns/gnunet-service-gns_interceptor.h 
b/src/service/gns/gnunet-service-gns_interceptor.h
similarity index 100%
rename from src/gns/gnunet-service-gns_interceptor.h
rename to src/service/gns/gnunet-service-gns_interceptor.h
diff --git a/src/gns/gnunet-service-gns_resolver.c 
b/src/service/gns/gnunet-service-gns_resolver.c
similarity index 100%
rename from src/gns/gnunet-service-gns_resolver.c
rename to src/service/gns/gnunet-service-gns_resolver.c
diff --git a/src/gns/gnunet-service-gns_resolver.h 
b/src/service/gns/gnunet-service-gns_resolver.h
similarity index 100%
rename from src/gns/gnunet-service-gns_resolver.h
rename to src/service/gns/gnunet-service-gns_resolver.h
diff --git a/src/gns/gnunet_w32nsp_lib.h b/src/service/gns/gnunet_w32nsp_lib.h
similarity index 100%
rename from src/gns/gnunet_w32nsp_lib.h
rename to src/service/gns/gnunet_w32nsp_lib.h
diff --git a/src/gns/meson.build b/src/service/gns/meson.build
similarity index 100%
rename from src/gns/meson.build
rename to src/service/gns/meson.build
diff --git a/src/gns/nss/Makefile.am b/src/service/gns/nss/Makefile.am
similarity index 100%
rename from src/gns/nss/Makefile.am
rename to src/service/gns/nss/Makefile.am
diff --git a/src/gns/nss/map-file b/src/service/gns/nss/map-file
similarity index 100%
rename from src/gns/nss/map-file
rename to src/service/gns/nss/map-file
diff --git a/src/gns/nss/meson.build b/src/service/gns/nss/meson.build
similarity index 100%
rename from src/gns/nss/meson.build
rename to src/service/gns/nss/meson.build
diff --git a/src/gns/nss/nss_gns.c b/src/service/gns/nss/nss_gns.c
similarity index 100%
rename from src/gns/nss/nss_gns.c
rename to src/service/gns/nss/nss_gns.c
diff --git a/src/gns/nss/nss_gns_query.c b/src/service/gns/nss/nss_gns_query.c
similarity index 100%
rename from src/gns/nss/nss_gns_query.c
rename to src/service/gns/nss/nss_gns_query.c
diff --git a/src/gns/nss/nss_gns_query.h b/src/service/gns/nss/nss_gns_query.h
similarity index 100%
rename from src/gns/nss/nss_gns_query.h
rename to src/service/gns/nss/nss_gns_query.h
diff --git a/src/gns/openssl.cnf b/src/service/gns/openssl.cnf
similarity index 100%
rename from src/gns/openssl.cnf
rename to src/service/gns/openssl.cnf
diff --git a/src/gns/test_dns2gns.conf b/src/service/gns/test_dns2gns.conf
similarity index 100%
rename from src/gns/test_dns2gns.conf
rename to src/service/gns/test_dns2gns.conf
diff --git a/src/gns/test_gns_defaults.conf 
b/src/service/gns/test_gns_defaults.conf
similarity index 100%
rename from src/gns/test_gns_defaults.conf
rename to src/service/gns/test_gns_defaults.conf
diff --git a/src/gns/test_gns_lookup.conf b/src/service/gns/test_gns_lookup.conf
similarity index 100%
rename from src/gns/test_gns_lookup.conf
rename to src/service/gns/test_gns_lookup.conf
diff --git a/src/gns/test_gns_lookup_peer1.conf 
b/src/service/gns/test_gns_lookup_peer1.conf
similarity index 100%
rename from src/gns/test_gns_lookup_peer1.conf
rename to src/service/gns/test_gns_lookup_peer1.conf
diff --git a/src/gns/test_gns_lookup_peer2.conf 
b/src/service/gns/test_gns_lookup_peer2.conf
similarity index 100%
rename from src/gns/test_gns_lookup_peer2.conf
rename to src/service/gns/test_gns_lookup_peer2.conf
diff --git a/src/gns/test_gns_proxy.c b/src/service/gns/test_gns_proxy.c
similarity index 100%
rename from src/gns/test_gns_proxy.c
rename to src/service/gns/test_gns_proxy.c
diff --git a/src/gns/test_gns_proxy.conf b/src/service/gns/test_gns_proxy.conf
similarity index 100%
rename from src/gns/test_gns_proxy.conf
rename to src/service/gns/test_gns_proxy.conf
diff --git a/src/gns/test_gns_simple_lookup.conf 
b/src/service/gns/test_gns_simple_lookup.conf
similarity index 100%
rename from src/gns/test_gns_simple_lookup.conf
rename to src/service/gns/test_gns_simple_lookup.conf
diff --git a/src/gns/test_gnunet_gns.sh.in 
b/src/service/gns/test_gnunet_gns.sh.in
similarity index 100%
rename from src/gns/test_gnunet_gns.sh.in
rename to src/service/gns/test_gnunet_gns.sh.in
diff --git a/src/gns/test_proxy.sh b/src/service/gns/test_proxy.sh
similarity index 100%
rename from src/gns/test_proxy.sh
rename to src/service/gns/test_proxy.sh
diff --git a/src/gns/tlds.conf b/src/service/gns/tlds.conf
similarity index 100%
rename from src/gns/tlds.conf
rename to src/service/gns/tlds.conf
diff --git a/src/gns/w32resolver.h b/src/service/gns/w32resolver.h
similarity index 100%
rename from src/gns/w32resolver.h
rename to src/service/gns/w32resolver.h
diff --git 
a/src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey 
b/src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
similarity index 100%
rename from 
src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
rename to 
src/service/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
diff --git 
a/src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey 
b/src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
similarity index 100%
rename from 
src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
rename to 
src/service/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey
diff --git 
a/src/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey 
b/src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
similarity index 100%
rename from 
src/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
rename to 
src/service/gns/zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
diff --git a/src/gns/zonefiles/test_zonekey 
b/src/service/gns/zonefiles/test_zonekey
similarity index 100%
rename from src/gns/zonefiles/test_zonekey
rename to src/service/gns/zonefiles/test_zonekey
diff --git a/src/revocation/.gitignore b/src/service/revocation/.gitignore
similarity index 100%
rename from src/revocation/.gitignore
rename to src/service/revocation/.gitignore
diff --git a/src/revocation/Makefile.am b/src/service/revocation/Makefile.am
similarity index 55%
rename from src/revocation/Makefile.am
rename to src/service/revocation/Makefile.am
index 0684dd8f2..726c75ab6 100644
--- a/src/revocation/Makefile.am
+++ b/src/service/revocation/Makefile.am
@@ -15,41 +15,6 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   revocation.conf
 
-bin_PROGRAMS = \
- gnunet-revocation
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_revocation.la
-
-libgnunet_plugin_block_revocation_la_SOURCES = \
-  plugin_block_revocation.c
-libgnunet_plugin_block_revocation_la_LIBADD = \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la  \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
-  $(LTLIBINTL)
-libgnunet_plugin_block_revocation_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-gnunet_revocation_SOURCES = \
- gnunet-revocation.c
-gnunet_revocation_LDADD = \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_revocation_tvg_SOURCES = \
- gnunet-revocation-tvg.c
-gnunet_revocation_tvg_LDADD = \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 test_revocation_lsd0001testvectors_SOURCES = \
  test_revocation_testvectors.c
 test_revocation_lsd0001testvectors_LDADD = \
@@ -74,15 +39,12 @@ libgnunetrevocation_la_LDFLAGS = \
 libexec_PROGRAMS = \
  gnunet-service-revocation
 
-noinst_PROGRAMS = \
- gnunet-revocation-tvg
-
 gnunet_service_revocation_SOURCES = \
  gnunet-service-revocation.c
 gnunet_service_revocation_LDADD = \
   libgnunetrevocation.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/setu/libgnunetsetu.la \
+  $(top_builddir)/src/service/setu/libgnunetsetu.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -102,9 +64,6 @@ check_PROGRAMS = \
  #test_revocation \
  #test_revocation_lsd0001testvectors
 
-check_SCRIPTS = \
- #test_local_revocation.py
-
 if ENABLE_TEST_RUN
  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
  TESTS = \
@@ -112,9 +71,4 @@ if ENABLE_TEST_RUN
  $(check_PROGRAMS)
 endif
 
-test_local_revocation.py: test_local_revocation.py.in Makefile
-       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_local_revocation.py.in > test_local_revocation.py
-       chmod +x test_local_revocation.py
-
-EXTRA_DIST = test_revocation.conf \
-       test_local_revocation.py.in
+EXTRA_DIST = test_revocation.conf
diff --git a/src/revocation/gnunet-service-revocation.c 
b/src/service/revocation/gnunet-service-revocation.c
similarity index 100%
rename from src/revocation/gnunet-service-revocation.c
rename to src/service/revocation/gnunet-service-revocation.c
diff --git a/src/revocation/meson.build b/src/service/revocation/meson.build
similarity index 100%
rename from src/revocation/meson.build
rename to src/service/revocation/meson.build
diff --git a/src/revocation/revocation.conf.in 
b/src/service/revocation/revocation.conf.in
similarity index 100%
rename from src/revocation/revocation.conf.in
rename to src/service/revocation/revocation.conf.in
diff --git a/src/revocation/revocation.h b/src/service/revocation/revocation.h
similarity index 100%
rename from src/revocation/revocation.h
rename to src/service/revocation/revocation.h
diff --git a/src/revocation/revocation_api.c 
b/src/service/revocation/revocation_api.c
similarity index 100%
rename from src/revocation/revocation_api.c
rename to src/service/revocation/revocation_api.c
diff --git a/src/revocation/test_revocation.c 
b/src/service/revocation/test_revocation.c
similarity index 100%
rename from src/revocation/test_revocation.c
rename to src/service/revocation/test_revocation.c
diff --git a/src/revocation/test_revocation.conf 
b/src/service/revocation/test_revocation.conf
similarity index 100%
rename from src/revocation/test_revocation.conf
rename to src/service/revocation/test_revocation.conf
diff --git a/src/revocation/test_revocation_testvectors.c 
b/src/service/revocation/test_revocation_testvectors.c
similarity index 100%
rename from src/revocation/test_revocation_testvectors.c
rename to src/service/revocation/test_revocation_testvectors.c
diff --git a/src/seti/.gitignore b/src/service/seti/.gitignore
similarity index 100%
rename from src/seti/.gitignore
rename to src/service/seti/.gitignore
diff --git a/src/seti/Makefile.am b/src/service/seti/Makefile.am
similarity index 100%
rename from src/seti/Makefile.am
rename to src/service/seti/Makefile.am
diff --git a/src/seti/gnunet-service-seti.c 
b/src/service/seti/gnunet-service-seti.c
similarity index 100%
rename from src/seti/gnunet-service-seti.c
rename to src/service/seti/gnunet-service-seti.c
diff --git a/src/seti/gnunet-service-seti_protocol.h 
b/src/service/seti/gnunet-service-seti_protocol.h
similarity index 100%
rename from src/seti/gnunet-service-seti_protocol.h
rename to src/service/seti/gnunet-service-seti_protocol.h
diff --git a/src/seti/gnunet-seti-profiler.c 
b/src/service/seti/gnunet-seti-profiler.c
similarity index 100%
rename from src/seti/gnunet-seti-profiler.c
rename to src/service/seti/gnunet-seti-profiler.c
diff --git a/src/seti/meson.build b/src/service/seti/meson.build
similarity index 100%
rename from src/seti/meson.build
rename to src/service/seti/meson.build
diff --git a/src/seti/plugin_block_seti_test.c 
b/src/service/seti/plugin_block_seti_test.c
similarity index 100%
rename from src/seti/plugin_block_seti_test.c
rename to src/service/seti/plugin_block_seti_test.c
diff --git a/src/seti/seti.conf.in b/src/service/seti/seti.conf.in
similarity index 100%
rename from src/seti/seti.conf.in
rename to src/service/seti/seti.conf.in
diff --git a/src/seti/seti.h b/src/service/seti/seti.h
similarity index 100%
rename from src/seti/seti.h
rename to src/service/seti/seti.h
diff --git a/src/seti/seti_api.c b/src/service/seti/seti_api.c
similarity index 100%
rename from src/seti/seti_api.c
rename to src/service/seti/seti_api.c
diff --git a/src/seti/test_seti.conf b/src/service/seti/test_seti.conf
similarity index 100%
rename from src/seti/test_seti.conf
rename to src/service/seti/test_seti.conf
diff --git a/src/seti/test_seti_api.c b/src/service/seti/test_seti_api.c
similarity index 100%
rename from src/seti/test_seti_api.c
rename to src/service/seti/test_seti_api.c
diff --git a/src/setu/.gitignore b/src/service/setu/.gitignore
similarity index 100%
rename from src/setu/.gitignore
rename to src/service/setu/.gitignore
diff --git a/src/setu/Makefile.am b/src/service/setu/Makefile.am
similarity index 100%
rename from src/setu/Makefile.am
rename to src/service/setu/Makefile.am
diff --git a/src/setu/gnunet-service-setu.c 
b/src/service/setu/gnunet-service-setu.c
similarity index 100%
rename from src/setu/gnunet-service-setu.c
rename to src/service/setu/gnunet-service-setu.c
diff --git a/src/setu/gnunet-service-setu_protocol.h 
b/src/service/setu/gnunet-service-setu_protocol.h
similarity index 100%
rename from src/setu/gnunet-service-setu_protocol.h
rename to src/service/setu/gnunet-service-setu_protocol.h
diff --git a/src/setu/gnunet-service-setu_strata_estimator.c 
b/src/service/setu/gnunet-service-setu_strata_estimator.c
similarity index 100%
rename from src/setu/gnunet-service-setu_strata_estimator.c
rename to src/service/setu/gnunet-service-setu_strata_estimator.c
diff --git a/src/setu/gnunet-service-setu_strata_estimator.h 
b/src/service/setu/gnunet-service-setu_strata_estimator.h
similarity index 100%
rename from src/setu/gnunet-service-setu_strata_estimator.h
rename to src/service/setu/gnunet-service-setu_strata_estimator.h
diff --git a/src/setu/gnunet-setu-ibf-profiler.c 
b/src/service/setu/gnunet-setu-ibf-profiler.c
similarity index 100%
rename from src/setu/gnunet-setu-ibf-profiler.c
rename to src/service/setu/gnunet-setu-ibf-profiler.c
diff --git a/src/setu/gnunet-setu-profiler.c 
b/src/service/setu/gnunet-setu-profiler.c
similarity index 100%
rename from src/setu/gnunet-setu-profiler.c
rename to src/service/setu/gnunet-setu-profiler.c
diff --git a/src/setu/ibf.c b/src/service/setu/ibf.c
similarity index 100%
rename from src/setu/ibf.c
rename to src/service/setu/ibf.c
diff --git a/src/setu/ibf.h b/src/service/setu/ibf.h
similarity index 100%
rename from src/setu/ibf.h
rename to src/service/setu/ibf.h
diff --git a/src/setu/ibf_sim.c b/src/service/setu/ibf_sim.c
similarity index 100%
rename from src/setu/ibf_sim.c
rename to src/service/setu/ibf_sim.c
diff --git a/src/setu/meson.build b/src/service/setu/meson.build
similarity index 100%
rename from src/setu/meson.build
rename to src/service/setu/meson.build
diff --git a/src/setu/perf_setu_api.c b/src/service/setu/perf_setu_api.c
similarity index 100%
rename from src/setu/perf_setu_api.c
rename to src/service/setu/perf_setu_api.c
diff --git a/src/setu/plugin_block_setu_test.c 
b/src/service/setu/plugin_block_setu_test.c
similarity index 100%
rename from src/setu/plugin_block_setu_test.c
rename to src/service/setu/plugin_block_setu_test.c
diff --git a/src/setu/setu.conf.in b/src/service/setu/setu.conf.in
similarity index 100%
rename from src/setu/setu.conf.in
rename to src/service/setu/setu.conf.in
diff --git a/src/setu/setu.h b/src/service/setu/setu.h
similarity index 100%
rename from src/setu/setu.h
rename to src/service/setu/setu.h
diff --git a/src/setu/setu_api.c b/src/service/setu/setu_api.c
similarity index 100%
rename from src/setu/setu_api.c
rename to src/service/setu/setu_api.c
diff --git a/src/setu/test_setu.conf b/src/service/setu/test_setu.conf
similarity index 100%
rename from src/setu/test_setu.conf
rename to src/service/setu/test_setu.conf
diff --git a/src/setu/test_setu_api.c b/src/service/setu/test_setu_api.c
similarity index 100%
rename from src/setu/test_setu_api.c
rename to src/service/setu/test_setu_api.c
diff --git a/src/service/testing/.gitignore b/src/service/testing/.gitignore
index d75315c79..a1e77a8e4 100644
--- a/src/service/testing/.gitignore
+++ b/src/service/testing/.gitignore
@@ -1,3 +1,4 @@
+test_testing_start_with_config
 list-keys
 gnunet-testing
 test_testing_peerstartup
diff --git a/src/vpn/.gitignore b/src/service/vpn/.gitignore
similarity index 100%
rename from src/vpn/.gitignore
rename to src/service/vpn/.gitignore
diff --git a/src/vpn/Makefile.am b/src/service/vpn/Makefile.am
similarity index 86%
rename from src/vpn/Makefile.am
rename to src/service/vpn/Makefile.am
index 6fc1bff20..123ec77de 100644
--- a/src/vpn/Makefile.am
+++ b/src/service/vpn/Makefile.am
@@ -27,9 +27,6 @@ libexec_PROGRAMS = \
   $(VPNBIN) \
   gnunet-service-vpn
 
-bin_PROGRAMS = \
-  gnunet-vpn
-
 gnunet_helper_vpn_SOURCES = \
   gnunet-helper-vpn.c
 gnunet_helper_vpn_LDADD = \
@@ -47,13 +44,6 @@ gnunet_service_vpn_LDADD = \
 gnunet_service_vpn_CFLAGS = \
   -I$(top_srcdir)/src/exit $(CFLAGS)
 
-gnunet_vpn_SOURCES = \
- gnunet-vpn.c
-gnunet_vpn_LDADD = \
-  libgnunetvpn.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h
 libgnunetvpn_la_LIBADD = \
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/service/vpn/gnunet-helper-vpn.c
similarity index 100%
rename from src/vpn/gnunet-helper-vpn.c
rename to src/service/vpn/gnunet-helper-vpn.c
diff --git a/src/vpn/gnunet-service-vpn.c b/src/service/vpn/gnunet-service-vpn.c
similarity index 100%
rename from src/vpn/gnunet-service-vpn.c
rename to src/service/vpn/gnunet-service-vpn.c
diff --git a/src/vpn/meson.build b/src/service/vpn/meson.build
similarity index 100%
rename from src/vpn/meson.build
rename to src/service/vpn/meson.build
diff --git a/src/vpn/tests/expected b/src/service/vpn/tests/expected
similarity index 100%
rename from src/vpn/tests/expected
rename to src/service/vpn/tests/expected
diff --git a/src/vpn/tests/ping b/src/service/vpn/tests/ping
similarity index 100%
rename from src/vpn/tests/ping
rename to src/service/vpn/tests/ping
diff --git a/src/vpn/tests/test-helper-icmp.sh 
b/src/service/vpn/tests/test-helper-icmp.sh
similarity index 100%
rename from src/vpn/tests/test-helper-icmp.sh
rename to src/service/vpn/tests/test-helper-icmp.sh
diff --git a/src/vpn/tests/test-helper-ifaddr.sh 
b/src/service/vpn/tests/test-helper-ifaddr.sh
similarity index 100%
rename from src/vpn/tests/test-helper-ifaddr.sh
rename to src/service/vpn/tests/test-helper-ifaddr.sh
diff --git a/src/vpn/vpn.conf.in b/src/service/vpn/vpn.conf.in
similarity index 100%
rename from src/vpn/vpn.conf.in
rename to src/service/vpn/vpn.conf.in
diff --git a/src/vpn/vpn.h b/src/service/vpn/vpn.h
similarity index 100%
rename from src/vpn/vpn.h
rename to src/service/vpn/vpn.h
diff --git a/src/vpn/vpn_api.c b/src/service/vpn/vpn_api.c
similarity index 100%
rename from src/vpn/vpn_api.c
rename to src/service/vpn/vpn_api.c
diff --git a/src/zonemaster/.gitignore b/src/service/zonemaster/.gitignore
similarity index 100%
rename from src/zonemaster/.gitignore
rename to src/service/zonemaster/.gitignore
diff --git a/src/zonemaster/Makefile.am b/src/service/zonemaster/Makefile.am
similarity index 100%
rename from src/zonemaster/Makefile.am
rename to src/service/zonemaster/Makefile.am
diff --git a/src/zonemaster/gnunet-service-zonemaster.c 
b/src/service/zonemaster/gnunet-service-zonemaster.c
similarity index 100%
rename from src/zonemaster/gnunet-service-zonemaster.c
rename to src/service/zonemaster/gnunet-service-zonemaster.c
diff --git a/src/zonemaster/meson.build b/src/service/zonemaster/meson.build
similarity index 100%
rename from src/zonemaster/meson.build
rename to src/service/zonemaster/meson.build
diff --git a/src/zonemaster/zonemaster.conf.in 
b/src/service/zonemaster/zonemaster.conf.in
similarity index 100%
rename from src/zonemaster/zonemaster.conf.in
rename to src/service/zonemaster/zonemaster.conf.in

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread]
Current Thread
[Next in Thread]
[gnunet] branch master updated (98c00bad3 -> b56e4e05a), gnunet <=
- [gnunet] 01/06: BUILD: Move scalarproduct to contrib/service, gnunet, 2023/10/19
- [gnunet] 02/06: BUILD: Move seti/setu to service, gnunet, 2023/10/19
- [gnunet] 03/06: BUILD: Move revocation to service, gnunet, 2023/10/19
- [gnunet] 04/06: BUILD: Move vpn to service, gnunet, 2023/10/19
- [gnunet] 05/06: BUILD: Move gns/zonemaster to service, gnunet, 2023/10/19
- [gnunet] 06/06: BUILD: Move conversation to contrib/service, gnunet, 2023/10/19
Prev by Date: [gnunet] 04/06: BUILD: Move vpn to service
Next by Date: [gnunet] 05/06: BUILD: Move gns/zonemaster to service
Previous by thread: [gnunet] branch master updated (54a37c423 -> 98c00bad3)
Next by thread: [gnunet] 01/06: BUILD: Move scalarproduct to contrib/service
Index(es):
- Date
- Thread