149 files changed, 1954 insertions, 1833 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b1e94c50..524b989c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,7 @@
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   lib \
-        service \
         plugin \
-        rest-plugin \
+        service \
         cli \
         contrib
diff --git a/src/cli/namestore/meson.build b/src/cli/namestore/meson.build
index 2bad795b9..e619876c5 100644
--- a/src/cli/namestore/meson.build
+++ b/src/cli/namestore/meson.build
@@ -1,5 +1,5 @@
 executable ('gnunet-namestore',
-          gnunetnamestore_src,
+          ['gnunet-namestore.c'],
           dependencies: [libgnunetnamestore_dep,
                          libgnunetutil_dep,
                          libgnunetgnsrecord_dep,
diff --git a/src/cli/revocation/Makefile.am b/src/cli/revocation/Makefile.am
index 6bd4919f9..3f8f5bb69 100644
--- a/src/cli/revocation/Makefile.am
+++ b/src/cli/revocation/Makefile.am
@@ -20,6 +20,7 @@ gnunet_revocation_SOURCES = \
 gnunet_revocation_LDADD = \
   $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
@@ -27,7 +28,7 @@ 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/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL)
 
diff --git a/src/cli/revocation/gnunet-revocation-tvg.c b/src/cli/revocation/gnunet-revocation-tvg.c
index 7d354ed74..5c2bfbe45 100644
--- a/src/cli/revocation/gnunet-revocation-tvg.c
+++ b/src/cli/revocation/gnunet-revocation-tvg.c
@@ -29,7 +29,7 @@
 #include "gnunet_revocation_service.h"
 #include "gnunet_testing_lib.h"
 // FIXME try to avoid this include somehow
-#include "../../service/revocation/revocation.h"
+#include "../../lib/gnsrecord/gnsrecord_crypto.h"
 #include <inttypes.h>
 
 #define TEST_EPOCHS 2
@@ -105,8 +105,8 @@ static void
 run_with_key (struct GNUNET_CRYPTO_PrivateKey *id_priv)
 {
   struct GNUNET_CRYPTO_PublicKey id_pub;
-  struct GNUNET_REVOCATION_PowP *pow;
-  struct GNUNET_REVOCATION_PowCalculationHandle *ph;
+  struct GNUNET_GNSRECORD_PowP *pow;
+  struct GNUNET_GNSRECORD_PowCalculationHandle *ph;
   struct GNUNET_TIME_Relative exp;
   char ztld[128];
   ssize_t key_len;
@@ -127,10 +127,10 @@ run_with_key (struct GNUNET_CRYPTO_PrivateKey *id_priv)
   fprintf (stdout, "Encoded zone identifier (zkl = zTLD):\n");
   fprintf (stdout, "%s\n", ztld);
   fprintf (stdout, "\n");
-  pow = GNUNET_malloc (GNUNET_REVOCATION_MAX_PROOF_SIZE);
-  GNUNET_REVOCATION_pow_init (id_priv,
+  pow = GNUNET_malloc (GNUNET_MAX_POW_SIZE);
+  GNUNET_GNSRECORD_pow_init (id_priv,
                               pow);
-  ph = GNUNET_REVOCATION_pow_start (pow,
+  ph = GNUNET_GNSRECORD_pow_start (pow,
                                     TEST_EPOCHS,
                                     TEST_DIFFICULTY);
   fprintf (stdout, "Difficulty (%d base difficulty + %d epochs): %d\n\n",
@@ -138,12 +138,12 @@ run_with_key (struct GNUNET_CRYPTO_PrivateKey *id_priv)
            TEST_EPOCHS,
            TEST_DIFFICULTY + TEST_EPOCHS);
   uint64_t pow_passes = 0;
-  while (GNUNET_YES != GNUNET_REVOCATION_pow_round (ph))
+  while (GNUNET_YES != GNUNET_GNSRECORD_pow_round (ph))
   {
     pow_passes++;
   }
-  struct GNUNET_REVOCATION_SignaturePurposePS *purp;
-  purp = REV_create_signature_message (pow);
+  struct GNUNET_GNSRECORD_SignaturePurposePS *purp;
+  purp = GNR_create_signature_message (pow);
   fprintf (stdout, "Signed message:\n");
   print_bytes (purp,
                ntohl (purp->purpose.size),
@@ -153,12 +153,12 @@ run_with_key (struct GNUNET_CRYPTO_PrivateKey *id_priv)
 
   exp = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS,
                                        TEST_EPOCHS);
-  GNUNET_assert (GNUNET_OK == GNUNET_REVOCATION_check_pow (pow,
+  GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_check_pow (pow,
                                                            TEST_DIFFICULTY,
                                                            exp));
   fprintf (stdout, "Proof:\n");
   print_bytes (pow,
-               GNUNET_REVOCATION_proof_get_size (pow),
+               GNUNET_GNSRECORD_proof_get_size (pow),
                8);
   GNUNET_free (ph);
 
diff --git a/src/cli/revocation/gnunet-revocation.c b/src/cli/revocation/gnunet-revocation.c
index 9667e7655..add9a003b 100644
--- a/src/cli/revocation/gnunet-revocation.c
+++ b/src/cli/revocation/gnunet-revocation.c
@@ -24,9 +24,9 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_revocation_service.h"
-#include "gnunet_identity_service.h"
 
 /**
  * Pow passes
@@ -101,7 +101,7 @@ static struct GNUNET_SCHEDULER_Task *pow_task;
 /**
  * Proof-of-work object
  */
-static struct GNUNET_REVOCATION_PowP *proof_of_work;
+static struct GNUNET_GNSRECORD_PowP *proof_of_work;
 
 /**
  * Function run if the user aborts with CTRL-C.
@@ -228,7 +228,7 @@ perform_revocation ()
 static void
 sync_pow ()
 {
-  size_t psize = GNUNET_REVOCATION_proof_get_size (proof_of_work);
+  size_t psize = GNUNET_GNSRECORD_proof_get_size (proof_of_work);
   if ((NULL != filename) &&
       (GNUNET_OK !=
        GNUNET_DISK_fn_write (filename,
@@ -248,7 +248,7 @@ sync_pow ()
 static void
 calculate_pow_shutdown (void *cls)
 {
-  struct GNUNET_REVOCATION_PowCalculationHandle *ph = cls;
+  struct GNUNET_GNSRECORD_PowCalculationHandle *ph = cls;
   fprintf (stderr, "%s", _ ("Cancelling calculation.\n"));
   sync_pow ();
   if (NULL != pow_task)
@@ -257,7 +257,7 @@ calculate_pow_shutdown (void *cls)
     pow_task = NULL;
   }
   if (NULL != ph)
-    GNUNET_REVOCATION_pow_stop (ph);
+    GNUNET_GNSRECORD_pow_stop (ph);
 }
 
 
@@ -269,7 +269,7 @@ calculate_pow_shutdown (void *cls)
 static void
 calculate_pow (void *cls)
 {
-  struct GNUNET_REVOCATION_PowCalculationHandle *ph = cls;
+  struct GNUNET_GNSRECORD_PowCalculationHandle *ph = cls;
   size_t psize;
 
   /* store temporary results */
@@ -277,9 +277,9 @@ calculate_pow (void *cls)
   if (0 == (pow_passes % 128))
     sync_pow ();
   /* actually do POW calculation */
-  if (GNUNET_OK == GNUNET_REVOCATION_pow_round (ph))
+  if (GNUNET_OK == GNUNET_GNSRECORD_pow_round (ph))
   {
-    psize = GNUNET_REVOCATION_proof_get_size (proof_of_work);
+    psize = GNUNET_GNSRECORD_proof_get_size (proof_of_work);
     if (NULL != filename)
     {
       (void) GNUNET_DISK_directory_remove (filename);
@@ -325,7 +325,7 @@ ego_callback (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
   struct GNUNET_CRYPTO_PublicKey key;
   const struct GNUNET_CRYPTO_PrivateKey *privkey;
-  struct GNUNET_REVOCATION_PowCalculationHandle *ph = NULL;
+  struct GNUNET_GNSRECORD_PowCalculationHandle *ph = NULL;
   size_t psize;
 
   el = NULL;
@@ -337,11 +337,11 @@ ego_callback (void *cls, struct GNUNET_IDENTITY_Ego *ego)
   }
   GNUNET_IDENTITY_ego_get_public_key (ego, &key);
   privkey = GNUNET_IDENTITY_ego_get_private_key (ego);
-  proof_of_work = GNUNET_malloc (GNUNET_REVOCATION_MAX_PROOF_SIZE);
+  proof_of_work = GNUNET_malloc (GNUNET_MAX_POW_SIZE);
   if ((NULL != filename) && (GNUNET_YES == GNUNET_DISK_file_test (filename)) &&
       (0 < (psize =
               GNUNET_DISK_fn_read (filename, proof_of_work,
-                                   GNUNET_REVOCATION_MAX_PROOF_SIZE))))
+                                   GNUNET_MAX_POW_SIZE))))
   {
     ssize_t ksize = GNUNET_CRYPTO_public_key_get_length (&key);
     if (0 > ksize)
@@ -360,9 +360,9 @@ ego_callback (void *cls, struct GNUNET_IDENTITY_Ego *ego)
       return;
     }
     if (GNUNET_YES ==
-        GNUNET_REVOCATION_check_pow (proof_of_work,
-                                     (unsigned int) matching_bits,
-                                     epoch_duration))
+        GNUNET_GNSRECORD_check_pow (proof_of_work,
+                                    (unsigned int) matching_bits,
+                                    epoch_duration))
     {
       fprintf (stderr, "%s", _ ("Revocation certificate ready\n"));
       if (perform)
@@ -377,20 +377,20 @@ ego_callback (void *cls, struct GNUNET_IDENTITY_Ego *ego)
     fprintf (stderr,
              "%s",
              _ ("Continuing calculation where left off...\n"));
-    ph = GNUNET_REVOCATION_pow_start (proof_of_work,
-                                      epochs,
-                                      matching_bits);
+    ph = GNUNET_GNSRECORD_pow_start (proof_of_work,
+                                     epochs,
+                                     matching_bits);
   }
   fprintf (stderr,
            "%s",
            _ ("Revocation certificate not ready, calculating proof of work\n"));
   if (NULL == ph)
   {
-    GNUNET_REVOCATION_pow_init (privkey,
-                                proof_of_work);
-    ph = GNUNET_REVOCATION_pow_start (proof_of_work,
-                                      epochs, /* Epochs */
-                                      matching_bits);
+    GNUNET_GNSRECORD_pow_init (privkey,
+                               proof_of_work);
+    ph = GNUNET_GNSRECORD_pow_start (proof_of_work,
+                                     epochs,  /* Epochs */
+                                     matching_bits);
   }
   pow_task = GNUNET_SCHEDULER_add_now (&calculate_pow, ph);
   GNUNET_SCHEDULER_add_shutdown (&calculate_pow_shutdown, ph);
@@ -419,7 +419,7 @@ run (void *cls,
   {
     if (GNUNET_OK !=
         GNUNET_CRYPTO_public_key_from_string (test_ego,
-                                                &pk))
+                                              &pk))
     {
       fprintf (stderr, _ ("Public key `%s' malformed\n"), test_ego);
       return;
@@ -472,17 +472,17 @@ run (void *cls,
   if ((NULL != filename) && (perform))
   {
     size_t bread;
-    proof_of_work = GNUNET_malloc (GNUNET_REVOCATION_MAX_PROOF_SIZE);
+    proof_of_work = GNUNET_malloc (GNUNET_MAX_POW_SIZE);
     if (0 < (bread = GNUNET_DISK_fn_read (filename,
                                           proof_of_work,
-                                          GNUNET_REVOCATION_MAX_PROOF_SIZE)))
+                                          GNUNET_MAX_POW_SIZE)))
     {
       fprintf (stderr,
                _ ("Failed to read revocation certificate from `%s'\n"),
                filename);
       return;
     }
-    psize = GNUNET_REVOCATION_proof_get_size (proof_of_work);
+    psize = GNUNET_GNSRECORD_proof_get_size (proof_of_work);
     if (bread != psize)
     {
       fprintf (stderr,
@@ -492,14 +492,14 @@ run (void *cls,
     }
     GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
     if (GNUNET_YES !=
-        GNUNET_REVOCATION_check_pow (proof_of_work,
-                                     (unsigned int) matching_bits,
-                                     epoch_duration))
+        GNUNET_GNSRECORD_check_pow (proof_of_work,
+                                    (unsigned int) matching_bits,
+                                    epoch_duration))
     {
-      struct GNUNET_REVOCATION_PowCalculationHandle *ph;
-      ph = GNUNET_REVOCATION_pow_start (proof_of_work,
-                                        epochs, /* Epochs */
-                                        matching_bits);
+      struct GNUNET_GNSRECORD_PowCalculationHandle *ph;
+      ph = GNUNET_GNSRECORD_pow_start (proof_of_work,
+                                       epochs,  /* Epochs */
+                                       matching_bits);
 
       pow_task = GNUNET_SCHEDULER_add_now (&calculate_pow, ph);
       GNUNET_SCHEDULER_add_shutdown (&calculate_pow_shutdown, ph);
diff --git a/src/cli/revocation/meson.build b/src/cli/revocation/meson.build
index 83923c278..090b381df 100644
--- a/src/cli/revocation/meson.build
+++ b/src/cli/revocation/meson.build
@@ -4,9 +4,19 @@ executable ('gnunet-revocation',
                            libgnunetutil_dep,
                            libgnunetstatistics_dep,
                            libgnunetcore_dep,
+                           libgnunetgnsrecord_dep,
                            libgnunetsetu_dep,
                            libgnunetidentity_dep],
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('bindir'))
 
+executable ('gnunet-revocation-tvg',
+            ['gnunet-revocation.c'],
+            dependencies: [libgnunetrevocation_dep,
+                           libgnunetutil_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetidentity_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index ca51f586c..f3ea3ed25 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -3637,8 +3637,6 @@ GNUNET_CRYPTO_key_get_public (const struct
                                 GNUNET_CRYPTO_PrivateKey *privkey,
                                 struct GNUNET_CRYPTO_PublicKey *key);
 
-
-
 #if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index d78e637e8..3f1830498 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -829,6 +829,135 @@ GNUNET_GNSRECORD_normalize_record_set (const char *label,
 enum GNUNET_GenericReturnValue
 GNUNET_GNSRECORD_label_check (const char*label, char **emsg);
 
+/**
+ * Maximum length of a revocation
+ */
+#define GNUNET_MAX_POW_SIZE sizeof(struct GNUNET_GNSRECORD_PowP) +\
+                                         sizeof(struct GNUNET_CRYPTO_PublicKey) +\
+                                         1024 //FIXME max sig_len
+
+/**
+ * The proof-of-work narrowing factor.
+ * The number of PoWs that are calculates as part of revocation.
+ */
+#define POW_COUNT 32
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Struct for a proof of work as part of the revocation.
+ */
+struct GNUNET_GNSRECORD_PowP
+{
+  /**
+   * The timestamp of the revocation
+   */
+  struct GNUNET_TIME_AbsoluteNBO timestamp;
+
+  /**
+   * The TTL of this revocation (purely informational)
+   */
+  struct GNUNET_TIME_RelativeNBO ttl;
+
+  /**
+   * The PoWs
+   */
+  uint64_t pow[POW_COUNT] GNUNET_PACKED;
+
+  /** followed by the public key type, the key and a signature **/
+};
+
+
+/**
+ * The signature object we use for the PoW
+ */
+struct GNUNET_GNSRECORD_SignaturePurposePS
+{
+  /**
+   * The signature purpose
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * The timestamp of the revocation
+   */
+  struct GNUNET_TIME_AbsoluteNBO timestamp;
+
+  /** Followed by the zone public key type and key **/
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+
+/**
+ * Handle to a running proof-of-work calculation.
+ */
+struct GNUNET_GNSRECORD_PowCalculationHandle;
+
+
+/**
+ * Check if the given proof-of-work is valid.
+ *
+ * @param pow proof of work
+ * @param matching_bits how many bits must match (configuration)
+ * @param epoch_duration length of single epoch in configuration
+ * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
+ */
+enum GNUNET_GenericReturnValue
+GNUNET_GNSRECORD_check_pow (const struct GNUNET_GNSRECORD_PowP *pow,
+                             unsigned int matching_bits,
+                             struct GNUNET_TIME_Relative epoch_duration);
+
+
+/**
+ * Initializes a fresh PoW computation.
+ *
+ * @param key the key to calculate the PoW for.
+ * @param pow the pow object to work with in the calculation.
+ */
+void
+GNUNET_GNSRECORD_pow_init (const struct GNUNET_CRYPTO_PrivateKey *key,
+                            struct GNUNET_GNSRECORD_PowP *pow);
+
+
+/**
+ * Starts a proof-of-work calculation given the pow object as well as
+ * target epochs and difficulty.
+ *
+ * @param pow the PoW to based calculations on.
+ * @param epochs the number of epochs for which the PoW must be valid.
+ * @param difficulty the base difficulty of the PoW.
+ * @return a handle for use in PoW rounds
+ */
+struct GNUNET_GNSRECORD_PowCalculationHandle*
+GNUNET_GNSRECORD_pow_start (struct GNUNET_GNSRECORD_PowP *pow,
+                             int epochs,
+                             unsigned int difficulty);
+
+
+/**
+ * Calculate a single round in the key revocation PoW.
+ *
+ * @param pc handle to the PoW, initially called with NULL.
+ * @return GNUNET_YES if the @a pow is acceptable, GNUNET_NO if not
+ */
+enum GNUNET_GenericReturnValue
+GNUNET_GNSRECORD_pow_round (struct GNUNET_GNSRECORD_PowCalculationHandle *pc);
+
+size_t
+GNUNET_GNSRECORD_proof_get_size (const struct GNUNET_GNSRECORD_PowP *pow);
+
+/**
+ * Stop a PoW calculation
+ *
+ * @param pc the calculation to clean up
+ * @return #GNUNET_YES if pow valid, #GNUNET_NO if pow was set but is not
+ * valid
+ */
+void
+GNUNET_GNSRECORD_pow_stop (struct GNUNET_GNSRECORD_PowCalculationHandle *pc);
+
 #if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif
diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h
index 45b391ca1..3a8af5389 100644
--- a/src/include/gnunet_rest_plugin.h
+++ b/src/include/gnunet_rest_plugin.h
@@ -63,24 +63,13 @@ struct GNUNET_REST_Plugin
    * e.g. http://hostname:port/name
    */
   char *name;
-
-  /**
-   * Function to process a REST call
-   *
-   * @param method the HTTP method called
-   * @param url the relative url accessed
-   * @param data the REST data (can be NULL)
-   * @param data_size the length of the data
-   * @param proc the callback for result
-   * @param proc_cls closure for callback
-   * @return GNUNET_YES if the request was processed
-   */
-  enum GNUNET_GenericReturnValue (*process_request)(
-    struct GNUNET_REST_RequestHandle *handle,
-    GNUNET_REST_ResultProcessor proc,
-    void *proc_cls);
 };
 
+typedef enum GNUNET_GenericReturnValue (*GNUNET_REST_ProcessingFunction)(
+  void *plugin,
+  struct GNUNET_REST_RequestHandle *handle,
+  GNUNET_REST_ResultProcessor proc,
+  void *proc_cls);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h
index de5eedbb9..427be62ac 100644
--- a/src/include/gnunet_revocation_service.h
+++ b/src/include/gnunet_revocation_service.h
@@ -22,6 +22,7 @@
 #define GNUNET_REVOCATION_SERVICE_H_
 
 
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_identity_service.h"
 
 /**
@@ -56,71 +57,6 @@ extern "C"
  */
 #define GNUNET_REVOCATION_VERSION 0x00000001
 
-/**
- * Maximum length of a revocation
- */
-#define GNUNET_REVOCATION_MAX_PROOF_SIZE sizeof(struct GNUNET_REVOCATION_PowP) +\
-                                         sizeof(struct GNUNET_CRYPTO_PublicKey) +\
-                                         1024 //FIXME max sig_len
-
-/**
- * The proof-of-work narrowing factor.
- * The number of PoWs that are calculates as part of revocation.
- */
-#define POW_COUNT 32
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Struct for a proof of work as part of the revocation.
- */
-struct GNUNET_REVOCATION_PowP
-{
-  /**
-   * The timestamp of the revocation
-   */
-  struct GNUNET_TIME_AbsoluteNBO timestamp;
-
-  /**
-   * The TTL of this revocation (purely informational)
-   */
-  struct GNUNET_TIME_RelativeNBO ttl;
-
-  /**
-   * The PoWs
-   */
-  uint64_t pow[POW_COUNT] GNUNET_PACKED;
-
-  /** followed by the public key type, the key and a signature **/
-};
-
-
-/**
- * The signature object we use for the PoW
- */
-struct GNUNET_REVOCATION_SignaturePurposePS
-{
-  /**
-   * The signature purpose
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * The timestamp of the revocation
-   */
-  struct GNUNET_TIME_AbsoluteNBO timestamp;
-
-  /** Followed by the zone public key type and key **/
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Handle to a running proof-of-work calculation.
- */
-struct GNUNET_REVOCATION_PowCalculationHandle;
 
 /**
  * Handle for the key revocation query.
@@ -176,7 +112,7 @@ struct GNUNET_REVOCATION_Handle;
  *
  * @param cfg the configuration to use
  * @param pow proof of work to use (should have been created by
- *            iteratively calling #GNUNET_REVOCATION_pow_round)
+ *            iteratively calling #GNUNET_CRYPTO_pow_round)
  * @param func function to call with the result of the check
  *             (called with `is_valid` being #GNUNET_NO if
  *              the revocation worked).
@@ -185,7 +121,7 @@ struct GNUNET_REVOCATION_Handle;
  */
 struct GNUNET_REVOCATION_Handle *
 GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          const struct GNUNET_REVOCATION_PowP *pow,
+                          const struct GNUNET_GNSRECORD_PowP *pow,
                           GNUNET_REVOCATION_Callback func, void *func_cls);
 
 
@@ -198,68 +134,6 @@ void
 GNUNET_REVOCATION_revoke_cancel (struct GNUNET_REVOCATION_Handle *h);
 
 
-/**
- * Check if the given proof-of-work is valid.
- *
- * @param pow proof of work
- * @param matching_bits how many bits must match (configuration)
- * @param epoch_duration length of single epoch in configuration
- * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-GNUNET_REVOCATION_check_pow (const struct GNUNET_REVOCATION_PowP *pow,
-                             unsigned int matching_bits,
-                             struct GNUNET_TIME_Relative epoch_duration);
-
-
-/**
- * Initializes a fresh PoW computation.
- *
- * @param key the key to calculate the PoW for.
- * @param pow the pow object to work with in the calculation.
- */
-void
-GNUNET_REVOCATION_pow_init (const struct GNUNET_CRYPTO_PrivateKey *key,
-                            struct GNUNET_REVOCATION_PowP *pow);
-
-
-/**
- * Starts a proof-of-work calculation given the pow object as well as
- * target epochs and difficulty.
- *
- * @param pow the PoW to based calculations on.
- * @param epochs the number of epochs for which the PoW must be valid.
- * @param difficulty the base difficulty of the PoW.
- * @return a handle for use in PoW rounds
- */
-struct GNUNET_REVOCATION_PowCalculationHandle*
-GNUNET_REVOCATION_pow_start (struct GNUNET_REVOCATION_PowP *pow,
-                             int epochs,
-                             unsigned int difficulty);
-
-
-/**
- * Calculate a single round in the key revocation PoW.
- *
- * @param pc handle to the PoW, initially called with NULL.
- * @return GNUNET_YES if the @a pow is acceptable, GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-GNUNET_REVOCATION_pow_round (struct GNUNET_REVOCATION_PowCalculationHandle *pc);
-
-
-/**
- * Stop a PoW calculation
- *
- * @param pc the calculation to clean up
- * @return #GNUNET_YES if pow valid, #GNUNET_NO if pow was set but is not
- * valid
- */
-void
-GNUNET_REVOCATION_pow_stop (struct GNUNET_REVOCATION_PowCalculationHandle *pc);
-
-size_t
-GNUNET_REVOCATION_proof_get_size (const struct GNUNET_REVOCATION_PowP *pow);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
diff --git a/src/lib/gnsrecord/Makefile.am b/src/lib/gnsrecord/Makefile.am
index 57b004847..ab79de900 100644
--- a/src/lib/gnsrecord/Makefile.am
+++ b/src/lib/gnsrecord/Makefile.am
@@ -47,6 +47,7 @@ libgnunetgnsrecord_la_SOURCES = \
   gnsrecord.c \
   gnsrecord_serialization.c \
   gnsrecord_crypto.c \
+  gnsrecord_pow.c \
   gnsrecord_misc.c
 libgnunetgnsrecord_la_LIBADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
diff --git a/src/lib/gnsrecord/gnsrecord_crypto.h b/src/lib/gnsrecord/gnsrecord_crypto.h
index 4f2e4a5ca..85f2258ab 100644
--- a/src/lib/gnsrecord/gnsrecord_crypto.h
+++ b/src/lib/gnsrecord/gnsrecord_crypto.h
@@ -83,3 +83,12 @@ GNR_derive_block_xsalsa_key (unsigned char *nonce,
                          uint64_t exp,
                          const struct GNUNET_CRYPTO_EddsaPublicKey *pub);
 
+/**
+ * Create the revocation metadata to sign for a revocation message
+ *
+ * @param pow the PoW to sign
+ * @return the signature purpose
+ */
+struct GNUNET_GNSRECORD_SignaturePurposePS *
+GNR_create_signature_message (const struct GNUNET_GNSRECORD_PowP *pow);
+
diff --git a/src/lib/gnsrecord/gnsrecord_pow.c b/src/lib/gnsrecord/gnsrecord_pow.c
new file mode 100644
index 000000000..a40dd7802
--- /dev/null
+++ b/src/lib/gnsrecord/gnsrecord_pow.c
@@ -0,0 +1,462 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2013, 2016 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+
+/**
+ * @brief API for proof of work
+ * @author Martin Schanzenbach
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_gnsrecord_lib.h"
+#include "gnunet_signatures.h"
+#include "gnunet_protocols.h"
+#include <inttypes.h>
+
+/**
+ * Helper struct that holds a found pow nonce
+ * and the corresponding number of leading zeros.
+ */
+struct BestPow
+{
+  /**
+   * PoW nonce
+   */
+  uint64_t pow;
+
+  /**
+   * Corresponding zero bits in hash
+   */
+  unsigned int bits;
+};
+
+
+/**
+ * The handle to a PoW calculation.
+ * Used in iterative PoW rounds.
+ */
+struct GNUNET_GNSRECORD_PowCalculationHandle
+{
+  /**
+   * Current set of found PoWs
+   */
+  struct BestPow best[POW_COUNT];
+
+  /**
+   * The final PoW result data structure.
+   */
+  struct GNUNET_GNSRECORD_PowP *pow;
+
+  /**
+   * The current nonce to try
+   */
+  uint64_t current_pow;
+
+  /**
+   * Epochs how long the PoW should be valid.
+   * This is added on top of the difficulty in the PoW.
+   */
+  unsigned int epochs;
+
+  /**
+   * The difficulty (leading zeros) to achieve.
+   */
+  unsigned int difficulty;
+
+};
+
+static struct GNUNET_CRYPTO_PowSalt salt = { "GnsRevocationPow" };
+
+/**
+ * Calculate the average zeros in the pows.
+ *
+ * @param ph the PowHandle
+ * @return the average number of zeros.
+ */
+static unsigned int
+calculate_score (const struct GNUNET_GNSRECORD_PowCalculationHandle *ph)
+{
+  double sum = 0.0;
+  for (unsigned int j = 0; j<POW_COUNT; j++)
+    sum += ph->best[j].bits;
+  double avg = sum / POW_COUNT;
+  return avg;
+}
+
+
+struct GNUNET_GNSRECORD_SignaturePurposePS *
+GNR_create_signature_message (const struct GNUNET_GNSRECORD_PowP *pow)
+{
+  struct GNUNET_GNSRECORD_SignaturePurposePS *spurp;
+  const struct GNUNET_CRYPTO_PublicKey *pk;
+  size_t ksize;
+
+  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
+  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
+  spurp = GNUNET_malloc (sizeof (*spurp) + ksize);
+  spurp->timestamp = pow->timestamp;
+  spurp->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_REVOCATION);
+  spurp->purpose.size = htonl (sizeof(*spurp) + ksize);
+  GNUNET_CRYPTO_write_public_key_to_buffer (pk,
+                                            (char*) &spurp[1],
+                                            ksize);
+  return spurp;
+}
+
+
+enum GNUNET_GenericReturnValue
+check_signature_identity (const struct GNUNET_GNSRECORD_PowP *pow,
+                          const struct GNUNET_CRYPTO_PublicKey *key)
+{
+  struct GNUNET_GNSRECORD_SignaturePurposePS *spurp;
+  unsigned char *sig;
+  size_t ksize;
+  int ret;
+
+  ksize = GNUNET_CRYPTO_public_key_get_length (key);
+  spurp = GNR_create_signature_message (pow);
+  sig = ((unsigned char*) &pow[1] + ksize);
+  ret =
+    GNUNET_CRYPTO_signature_verify_raw_ (
+      GNUNET_SIGNATURE_PURPOSE_GNS_REVOCATION,
+      &spurp->purpose,
+      sig,
+      key);
+  GNUNET_free (spurp);
+  return ret == GNUNET_OK ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+enum GNUNET_GenericReturnValue
+check_signature (const struct GNUNET_GNSRECORD_PowP *pow)
+{
+  const struct GNUNET_CRYPTO_PublicKey *pk;
+
+  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
+  return check_signature_identity (pow, pk);
+}
+
+
+/**
+ * Check if the given proof-of-work is valid.
+ *
+ * @param pow proof of work
+ * @param difficulty how many bits must match (configuration) LSD0001: D
+ * @param epoch_duration length of single epoch in configuration
+ * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
+ */
+enum GNUNET_GenericReturnValue
+GNUNET_GNSRECORD_check_pow (const struct GNUNET_GNSRECORD_PowP *pow,
+                            unsigned int difficulty,
+                            struct GNUNET_TIME_Relative epoch_duration)
+{
+  char buf[sizeof(struct GNUNET_CRYPTO_PublicKey)
+           + sizeof (struct GNUNET_TIME_AbsoluteNBO)
+           + sizeof (uint64_t)] GNUNET_ALIGN;
+  struct GNUNET_HashCode result;
+  struct GNUNET_TIME_Absolute ts;
+  struct GNUNET_TIME_Absolute exp;
+  struct GNUNET_TIME_Relative ttl;
+  struct GNUNET_TIME_Relative buffer;
+  /* LSD0001: D' */
+  unsigned int score = 0;
+  unsigned int tmp_score = 0;
+  unsigned int epochs;
+  uint64_t pow_val;
+  ssize_t pklen;
+  const struct GNUNET_CRYPTO_PublicKey *pk;
+
+  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
+
+  /**
+   * Check if signature valid
+   */
+  if (GNUNET_OK != check_signature (pow))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Proof of work signature invalid!\n");
+    return GNUNET_SYSERR;
+  }
+
+  /**
+   * First, check if PoW set is strictly monotically increasing
+   */
+  for (unsigned int i = 0; i < POW_COUNT - 1; i++)
+  {
+    if (GNUNET_ntohll (pow->pow[i]) >= GNUNET_ntohll (pow->pow[i + 1]))
+      return GNUNET_NO;
+  }
+  GNUNET_memcpy (&buf[sizeof(uint64_t)],
+                 &pow->timestamp,
+                 sizeof (uint64_t));
+  pklen = GNUNET_CRYPTO_public_key_get_length (pk);
+  if (0 > pklen)
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
+  GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
+                 pk,
+                 pklen);
+  for (unsigned int i = 0; i < POW_COUNT; i++)
+  {
+    pow_val = GNUNET_ntohll (pow->pow[i]);
+    GNUNET_memcpy (buf, &pow->pow[i], sizeof(uint64_t));
+    GNUNET_CRYPTO_pow_hash (&salt,
+                            buf,
+                            sizeof(buf),
+                            &result);
+    tmp_score = GNUNET_CRYPTO_hash_count_leading_zeros (&result);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Score %u with %" PRIu64 " (#%u)\n",
+                tmp_score, pow_val, i);
+
+    score += tmp_score;
+
+  }
+  score = score / POW_COUNT;
+  if (score < difficulty)
+    return GNUNET_NO;
+  /* LSD0001: (D'-D+1) */
+  epochs = score - difficulty + 1;
+
+  /**
+   * Check expiration
+   */
+  ts = GNUNET_TIME_absolute_ntoh (pow->timestamp);
+  ttl = GNUNET_TIME_relative_multiply (epoch_duration,
+                                       epochs);
+  /**
+   * Extend by 10% for unsynchronized clocks
+   */
+  buffer = GNUNET_TIME_relative_divide (epoch_duration,
+                                        10);
+  exp = GNUNET_TIME_absolute_add (ts, ttl);
+  exp = GNUNET_TIME_absolute_add (exp,
+                                  buffer);
+
+  if (0 != GNUNET_TIME_absolute_get_remaining (ts).rel_value_us)
+    return GNUNET_NO; /* Not yet valid. */
+  /* Revert to actual start time */
+  ts = GNUNET_TIME_absolute_add (ts,
+                                 buffer);
+
+  if (0 == GNUNET_TIME_absolute_get_remaining (exp).rel_value_us)
+    return GNUNET_NO; /* expired */
+  return GNUNET_YES;
+}
+
+
+enum GNUNET_GenericReturnValue
+sign_pow_identity (const struct GNUNET_CRYPTO_PrivateKey *key,
+                   struct GNUNET_GNSRECORD_PowP *pow)
+{
+  struct GNUNET_TIME_Absolute ts = GNUNET_TIME_absolute_get ();
+  struct GNUNET_GNSRECORD_SignaturePurposePS *rp;
+  const struct GNUNET_CRYPTO_PublicKey *pk;
+  size_t ksize;
+  char *sig;
+
+  /**
+   * Predate the validity period to prevent rejections due to
+   * unsynchronized clocks
+   */
+  ts = GNUNET_TIME_absolute_subtract (ts,
+                                      GNUNET_TIME_UNIT_WEEKS);
+  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
+  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
+  pow->timestamp = GNUNET_TIME_absolute_hton (ts);
+  rp = GNR_create_signature_message (pow);
+  sig = ((char*) &pow[1]) + ksize;
+  int result = GNUNET_CRYPTO_sign_raw_ (key,
+                                        &rp->purpose,
+                                        (void*) sig);
+  GNUNET_free (rp);
+  if (result == GNUNET_SYSERR)
+    return GNUNET_NO;
+  else
+    return result;
+}
+
+
+enum GNUNET_GenericReturnValue
+sign_pow (const struct GNUNET_CRYPTO_PrivateKey *key,
+          struct GNUNET_GNSRECORD_PowP *pow)
+{
+  struct GNUNET_CRYPTO_PublicKey *pk;
+
+  pk = (struct GNUNET_CRYPTO_PublicKey *) &pow[1];
+  GNUNET_CRYPTO_key_get_public (key, pk);
+  return sign_pow_identity (key, pow);
+}
+
+
+/**
+ * Initializes a fresh PoW computation.
+ *
+ * @param key the key to calculate the PoW for.
+ * @param[out] pow starting point for PoW calculation (not yet valid)
+ */
+void
+GNUNET_GNSRECORD_pow_init (const struct GNUNET_CRYPTO_PrivateKey *key,
+                           struct GNUNET_GNSRECORD_PowP *pow)
+{
+  GNUNET_assert (GNUNET_OK == sign_pow (key, pow));
+}
+
+
+struct GNUNET_GNSRECORD_PowCalculationHandle*
+GNUNET_GNSRECORD_pow_start (struct GNUNET_GNSRECORD_PowP *pow,
+                            int epochs,
+                            unsigned int difficulty)
+{
+  struct GNUNET_GNSRECORD_PowCalculationHandle *pc;
+  struct GNUNET_TIME_Relative ttl;
+
+
+  pc = GNUNET_new (struct GNUNET_GNSRECORD_PowCalculationHandle);
+  pc->pow = pow;
+  ttl = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS,
+                                       epochs);
+  pc->pow->ttl = GNUNET_TIME_relative_hton (ttl);
+  pc->current_pow = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                              UINT64_MAX);
+  pc->difficulty = difficulty;
+  pc->epochs = epochs;
+  return pc;
+}
+
+
+/**
+ * Comparison function for quicksort
+ *
+ * @param a left element
+ * @param b right element
+ * @return a-b
+ */
+static int
+cmp_pow_value (const void *a, const void *b)
+{
+  return (GNUNET_ntohll (*(uint64_t*) a) - GNUNET_ntohll (*(uint64_t*) b));
+}
+
+
+/**
+ * Calculate a key revocation valid for broadcasting for a number
+ * of epochs.
+ *
+ * @param pc handle to the PoW, initially called with NULL.
+ * @param epochs number of epochs for which the revocation must be valid.
+ * @param pow current pow value to try
+ * @param difficulty current base difficulty to achieve
+ * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
+ */
+enum GNUNET_GenericReturnValue
+GNUNET_GNSRECORD_pow_round (struct GNUNET_GNSRECORD_PowCalculationHandle *pc)
+{
+  char buf[sizeof(struct GNUNET_CRYPTO_PublicKey)
+           + sizeof (uint64_t)
+           + sizeof (uint64_t)] GNUNET_ALIGN;
+  struct GNUNET_HashCode result;
+  const struct GNUNET_CRYPTO_PublicKey *pk;
+  unsigned int zeros;
+  int ret;
+  uint64_t pow_nbo;
+  ssize_t ksize;
+
+  pc->current_pow++;
+  pk = (const struct GNUNET_CRYPTO_PublicKey *) &(pc->pow[1]);
+
+  /**
+   * Do not try duplicates
+   */
+  for (unsigned int i = 0; i < POW_COUNT; i++)
+    if (pc->current_pow == pc->best[i].pow)
+      return GNUNET_NO;
+  pow_nbo = GNUNET_htonll (pc->current_pow);
+  GNUNET_memcpy (buf, &pow_nbo, sizeof(uint64_t));
+  GNUNET_memcpy (&buf[sizeof(uint64_t)],
+                 &pc->pow->timestamp,
+                 sizeof (uint64_t));
+  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
+  GNUNET_assert (0 < ksize);
+  GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
+                 pk,
+                 ksize);
+  GNUNET_CRYPTO_pow_hash (&salt,
+                          buf,
+                          sizeof(buf),
+                          &result);
+  zeros = GNUNET_CRYPTO_hash_count_leading_zeros (&result);
+  for (unsigned int i = 0; i < POW_COUNT; i++)
+  {
+    if (pc->best[i].bits < zeros)
+    {
+      pc->best[i].bits = zeros;
+      pc->best[i].pow = pc->current_pow;
+      pc->pow->pow[i] = pow_nbo;
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "New best score %u with %" PRIu64 " (#%u)\n",
+                  zeros, pc->current_pow, i);
+
+      break;
+    }
+  }
+  ret = calculate_score (pc) >= pc->difficulty + pc->epochs ? GNUNET_YES :
+        GNUNET_NO;
+  if (GNUNET_YES == ret)
+  {
+    /* Sort POWs) */
+    qsort (pc->pow->pow, POW_COUNT, sizeof (uint64_t), &cmp_pow_value);
+  }
+  return ret;
+}
+
+
+size_t
+GNUNET_GNSRECORD_proof_get_size (const struct GNUNET_GNSRECORD_PowP *pow)
+{
+  size_t size;
+  size_t ksize;
+  const struct GNUNET_CRYPTO_PublicKey *pk;
+
+  size = sizeof (struct GNUNET_GNSRECORD_PowP);
+  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
+  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
+  size += ksize;
+  size += GNUNET_CRYPTO_signature_get_raw_length_by_type (pk->type);
+  return size;
+}
+
+
+/**
+ * Stop a PoW calculation
+ *
+ * @param pc the calculation to clean up
+ * @return #GNUNET_YES if pow valid, #GNUNET_NO if pow was set but is not
+ * valid
+ */
+void
+GNUNET_GNSRECORD_pow_stop (struct GNUNET_GNSRECORD_PowCalculationHandle *pc)
+{
+  GNUNET_free (pc);
+}
+
+
diff --git a/src/lib/gnsrecord/meson.build b/src/lib/gnsrecord/meson.build
index 3e35e0caf..a35d6b66e 100644
--- a/src/lib/gnsrecord/meson.build
+++ b/src/lib/gnsrecord/meson.build
@@ -1,6 +1,7 @@
 libgnunetgnsrecord_src = ['gnsrecord.c',
                           'gnsrecord_serialization.c',
                           'gnsrecord_crypto.c',
+                          'gnsrecord_pow.c',
                           'gnsrecord_misc.c']
 libgnunetgnsrecordjson_src = ['json_gnsrecord.c']
 
diff --git a/src/meson.build b/src/meson.build
index 5efd7e97a..8f8342a4d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,8 +4,7 @@ endif
 
 subdir('include')
 subdir('lib')
-subdir('service')
 subdir('plugin')
-subdir('rest-plugin')
+subdir('service')
 subdir('cli')
 subdir('contrib')
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 1a1ecffa7..78e06fd63 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -1,10 +1,16 @@
 SUBDIRS = \
         block \
+        dns \
         gnsrecord \
-        dhtu \
+        peerstore \
+        datacache \
+        datastore \
         namecache \
         namestore \
+        dht \
         revocation \
+        regex \
         gns \
         fs \
-        reclaim
+        reclaim \
+        messenger
diff --git a/src/plugin/datacache/Makefile.am b/src/plugin/datacache/Makefile.am
new file mode 100644
index 000000000..b9ae06975
--- /dev/null
+++ b/src/plugin/datacache/Makefile.am
@@ -0,0 +1,76 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+sqldir = $(prefix)/share/gnunet/sql/
+
+sql_DATA = \
+  datacache-0001.sql \
+  datacache-drop.sql
+
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+if HAVE_SQLITE
+  SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la
+endif
+if HAVE_POSTGRESQL
+  POSTGRES_PLUGIN = libgnunet_plugin_datacache_postgres.la
+endif
+
+plugin_LTLIBRARIES = \
+  $(SQLITE_PLUGIN) \
+  $(POSTGRES_PLUGIN) \
+  libgnunet_plugin_datacache_heap.la
+
+# Real plugins should of course go into
+# plugin_LTLIBRARIES
+noinst_LTLIBRARIES = \
+  libgnunet_plugin_datacache_template.la
+
+
+libgnunet_plugin_datacache_sqlite_la_SOURCES = \
+  plugin_datacache_sqlite.c
+libgnunet_plugin_datacache_sqlite_la_LIBADD = \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
+libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+libgnunet_plugin_datacache_heap_la_SOURCES = \
+  plugin_datacache_heap.c
+libgnunet_plugin_datacache_heap_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_datacache_heap_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+libgnunet_plugin_datacache_postgres_la_SOURCES = \
+  plugin_datacache_postgres.c
+libgnunet_plugin_datacache_postgres_la_LIBADD = \
+  $(top_builddir)/src/lib/pq/libgnunetpq.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_PLUGIN_LDFLAGS) -lpq
+libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \
+ $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
+libgnunet_plugin_datacache_postgres_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
+
+libgnunet_plugin_datacache_template_la_SOURCES = \
+  plugin_datacache_template.c
+libgnunet_plugin_datacache_template_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_datacache_template_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+EXTRA_DIST = \
+ $(sql_DATA)
diff --git a/src/service/datacache/datacache-0001.sql b/src/plugin/datacache/datacache-0001.sql
index 6567de3c2..6567de3c2 100644
--- a/src/service/datacache/datacache-0001.sql
+++ b/src/plugin/datacache/datacache-0001.sql
diff --git a/src/service/datacache/datacache-drop.sql b/src/plugin/datacache/datacache-drop.sql
index 2dd84bca8..2dd84bca8 100644
--- a/src/service/datacache/datacache-drop.sql
+++ b/src/plugin/datacache/datacache-drop.sql
diff --git a/src/plugin/datacache/meson.build b/src/plugin/datacache/meson.build
new file mode 100644
index 000000000..3c9e7d330
--- /dev/null
+++ b/src/plugin/datacache/meson.build
@@ -0,0 +1,30 @@
+install_data ('datacache-0001.sql',
+              'datacache-drop.sql',
+               install_dir: get_option('datadir')/'gnunet'/'sql')
+
+shared_module('gnunet_plugin_datacache_sqlite',
+        ['plugin_datacache_sqlite.c'],
+        dependencies: [libgnunetutil_dep,
+                       sqlite_dep,
+                       libgnunetsq_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+shared_module('gnunet_plugin_datacache_heap',
+        ['plugin_datacache_heap.c'],
+        dependencies: [libgnunetutil_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+if pq_dep.found()
+  shared_module('gnunet_plugin_datacache_postgres',
+          ['plugin_datacache_postgres.c'],
+          dependencies: [libgnunetutil_dep,
+                         pq_dep,
+                         libgnunetpq_dep],
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir')/'gnunet')
+endif
diff --git a/src/service/datacache/plugin_datacache_heap.c b/src/plugin/datacache/plugin_datacache_heap.c
index 0dd8e47f8..0dd8e47f8 100644
--- a/src/service/datacache/plugin_datacache_heap.c
+++ b/src/plugin/datacache/plugin_datacache_heap.c
diff --git a/src/service/datacache/plugin_datacache_postgres.c b/src/plugin/datacache/plugin_datacache_postgres.c
index 8bfd04aea..8bfd04aea 100644
--- a/src/service/datacache/plugin_datacache_postgres.c
+++ b/src/plugin/datacache/plugin_datacache_postgres.c
diff --git a/src/service/datacache/plugin_datacache_sqlite.c b/src/plugin/datacache/plugin_datacache_sqlite.c
index 1c6f24a82..1c6f24a82 100644
--- a/src/service/datacache/plugin_datacache_sqlite.c
+++ b/src/plugin/datacache/plugin_datacache_sqlite.c
diff --git a/src/service/datacache/plugin_datacache_template.c b/src/plugin/datacache/plugin_datacache_template.c
index 1bd712d39..1bd712d39 100644
--- a/src/service/datacache/plugin_datacache_template.c
+++ b/src/plugin/datacache/plugin_datacache_template.c
diff --git a/src/plugin/datastore/Makefile.am b/src/plugin/datastore/Makefile.am
new file mode 100644
index 000000000..1f4ab59c8
--- /dev/null
+++ b/src/plugin/datastore/Makefile.am
@@ -0,0 +1,150 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+sqldir = $(prefix)/share/gnunet/sql/
+
+sql_DATA = \
+  datastore-0001.sql \
+  datastore-drop.sql
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+
+if HAVE_SQLITE
+ SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
+if HAVE_BENCHMARKS
+  SQLITE_BENCHMARKS = \
+   perf_plugin_datastore_sqlite
+endif
+ SQLITE_TESTS = \
+  test_plugin_datastore_sqlite \
+  $(SQLITE_BENCHMARKS)
+endif
+if HAVE_POSTGRESQL
+ POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la
+if HAVE_BENCHMARKS
+  POSTGRES_BENCHMARKS = \
+   perf_plugin_datastore_postgres
+endif
+ POSTGRES_TESTS = \
+  test_plugin_datastore_postgres \
+  $(POSTGRES_BENCHMARKS)
+endif
+
+plugin_LTLIBRARIES = \
+  $(SQLITE_PLUGIN) \
+  $(POSTGRES_PLUGIN) \
+  libgnunet_plugin_datastore_heap.la
+
+# Real plugins should of course go into
+# plugin_LTLIBRARIES
+noinst_LTLIBRARIES = \
+  libgnunet_plugin_datastore_template.la
+
+
+libgnunet_plugin_datastore_sqlite_la_SOURCES = \
+  plugin_datastore_sqlite.c
+libgnunet_plugin_datastore_sqlite_la_LIBADD = \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
+libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_datastore_heap_la_SOURCES = \
+  plugin_datastore_heap.c
+libgnunet_plugin_datastore_heap_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_datastore_heap_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+libgnunet_plugin_datastore_postgres_la_SOURCES = \
+  plugin_datastore_postgres.c
+libgnunet_plugin_datastore_postgres_la_LIBADD = \
+  $(top_builddir)/src/lib/pq/libgnunetpq.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq
+libgnunet_plugin_datastore_postgres_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
+libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \
+ $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
+
+
+libgnunet_plugin_datastore_template_la_SOURCES = \
+  plugin_datastore_template.c
+libgnunet_plugin_datastore_template_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_datastore_template_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+check_PROGRAMS = \
+  perf_plugin_datastore_heap \
+  test_plugin_datastore_heap \
+  $(SQLITE_TESTS) \
+  $(POSTGRES_TESTS)
+
+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_PROGRAMS)
+endif
+
+perf_plugin_datastore_heap_SOURCES = \
+ perf_plugin_datastore.c
+perf_plugin_datastore_heap_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_plugin_datastore_heap_SOURCES = \
+ test_plugin_datastore.c
+test_plugin_datastore_heap_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+
+perf_plugin_datastore_sqlite_SOURCES = \
+ perf_plugin_datastore.c
+perf_plugin_datastore_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_plugin_datastore_sqlite_SOURCES = \
+ test_plugin_datastore.c
+test_plugin_datastore_sqlite_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+
+test_plugin_datastore_postgres_SOURCES = \
+ test_plugin_datastore.c
+test_plugin_datastore_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+perf_plugin_datastore_postgres_SOURCES = \
+ perf_plugin_datastore.c
+perf_plugin_datastore_postgres_LDADD = \
+ $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+
+EXTRA_DIST = \
+ test_defaults.conf \
+ perf_plugin_datastore_data_sqlite.conf \
+ test_plugin_datastore_data_sqlite.conf \
+ perf_plugin_datastore_data_heap.conf \
+ test_plugin_datastore_data_heap.conf \
+ perf_plugin_datastore_data_postgres.conf \
+ test_plugin_datastore_data_postgres.conf \
+ $(sql_DATA)
diff --git a/src/service/datastore/datastore-0001.sql b/src/plugin/datastore/datastore-0001.sql
index 0d4758be2..0d4758be2 100644
--- a/src/service/datastore/datastore-0001.sql
+++ b/src/plugin/datastore/datastore-0001.sql
diff --git a/src/service/datastore/datastore-drop.sql b/src/plugin/datastore/datastore-drop.sql
index 67fee303d..67fee303d 100644
--- a/src/service/datastore/datastore-drop.sql
+++ b/src/plugin/datastore/datastore-drop.sql
diff --git a/src/plugin/datastore/meson.build b/src/plugin/datastore/meson.build
new file mode 100644
index 000000000..6769cb78b
--- /dev/null
+++ b/src/plugin/datastore/meson.build
@@ -0,0 +1,75 @@
+install_data ('datastore-0001.sql',
+              'datastore-drop.sql',
+               install_dir: get_option('datadir')/'gnunet'/'sql')
+
+shared_module('gnunet_plugin_datastore_sqlite',
+        ['plugin_datastore_sqlite.c'],
+        dependencies: [libgnunetutil_dep,
+                       sqlite_dep,
+                       libgnunetsq_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+shared_module('gnunet_plugin_datastore_heap',
+        ['plugin_datastore_heap.c'],
+        dependencies: [libgnunetutil_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
+
+if pq_dep.found()
+  shared_module('gnunet_plugin_datastore_postgres',
+          ['plugin_datastore_postgres.c'],
+          dependencies: [libgnunetutil_dep,
+                         pq_dep,
+                         libgnunetpq_dep],
+          include_directories: [incdir, configuration_inc],
+          install: true,
+          install_dir: get_option('libdir')/'gnunet')
+endif
+
+testds_plugin_sqlite = executable ('test_plugin_datastore_sqlite',
+            ['test_plugin_datastore.c'],
+            dependencies: [
+              libgnunetutil_dep,
+              ],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+
+testds_plugin_heap = executable ('test_plugin_datastore_heap',
+            ['test_plugin_datastore.c'],
+            dependencies: [
+              libgnunetutil_dep,
+              ],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+
+testds_plugin_pq = executable ('test_plugin_datastore_postgres',
+            ['test_plugin_datastore.c'],
+            dependencies: [
+              libgnunetutil_dep,
+              ],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+
+configure_file(input : 'test_defaults.conf',
+               output : 'test_defaults.conf',
+               copy: true)
+configure_file(input : 'test_plugin_datastore_data_sqlite.conf',
+               output : 'test_plugin_datastore_data_sqlite.conf',
+               copy: true)
+configure_file(input : 'test_plugin_datastore_data_heap.conf',
+               output : 'test_plugin_datastore_data_heap.conf',
+               copy: true)
+configure_file(input : 'test_plugin_datastore_data_postgres.conf',
+               output : 'test_plugin_datastore_data_postgres.conf',
+               copy: true)
+
+test('test_plugin_datastore_sqlite', testds_plugin_sqlite,
+  suite: 'datastore', workdir: meson.current_build_dir())
+test('test_plugin_datastore_heap', testds_plugin_heap,
+  suite: 'datastore', workdir: meson.current_build_dir())
+test('test_plugin_datastore_postgres', testds_plugin_pq,
+  suite: 'datastore', workdir: meson.current_build_dir())
+
diff --git a/src/service/datastore/perf_plugin_datastore.c b/src/plugin/datastore/perf_plugin_datastore.c
index 8e63b08e6..8e63b08e6 100644
--- a/src/service/datastore/perf_plugin_datastore.c
+++ b/src/plugin/datastore/perf_plugin_datastore.c
diff --git a/src/service/datastore/perf_plugin_datastore_data_heap.conf b/src/plugin/datastore/perf_plugin_datastore_data_heap.conf
index 873cf9606..873cf9606 100644
--- a/src/service/datastore/perf_plugin_datastore_data_heap.conf
+++ b/src/plugin/datastore/perf_plugin_datastore_data_heap.conf
diff --git a/src/service/datastore/perf_plugin_datastore_data_postgres.conf b/src/plugin/datastore/perf_plugin_datastore_data_postgres.conf
index 7683887a8..7683887a8 100644
--- a/src/service/datastore/perf_plugin_datastore_data_postgres.conf
+++ b/src/plugin/datastore/perf_plugin_datastore_data_postgres.conf
diff --git a/src/service/datastore/perf_plugin_datastore_data_sqlite.conf b/src/plugin/datastore/perf_plugin_datastore_data_sqlite.conf
index 888e020a6..888e020a6 100644
--- a/src/service/datastore/perf_plugin_datastore_data_sqlite.conf
+++ b/src/plugin/datastore/perf_plugin_datastore_data_sqlite.conf
diff --git a/src/service/datastore/plugin_datastore_heap.c b/src/plugin/datastore/plugin_datastore_heap.c
index a827a2763..a827a2763 100644
--- a/src/service/datastore/plugin_datastore_heap.c
+++ b/src/plugin/datastore/plugin_datastore_heap.c
diff --git a/src/service/datastore/plugin_datastore_postgres.c b/src/plugin/datastore/plugin_datastore_postgres.c
index 5fcacc17b..5fcacc17b 100644
--- a/src/service/datastore/plugin_datastore_postgres.c
+++ b/src/plugin/datastore/plugin_datastore_postgres.c
diff --git a/src/service/datastore/plugin_datastore_sqlite.c b/src/plugin/datastore/plugin_datastore_sqlite.c
index 5ea9da4cb..5ea9da4cb 100644
--- a/src/service/datastore/plugin_datastore_sqlite.c
+++ b/src/plugin/datastore/plugin_datastore_sqlite.c
diff --git a/src/service/datastore/plugin_datastore_template.c b/src/plugin/datastore/plugin_datastore_template.c
index 2b455f8cb..2b455f8cb 100644
--- a/src/service/datastore/plugin_datastore_template.c
+++ b/src/plugin/datastore/plugin_datastore_template.c
diff --git a/src/service/datastore/test_plugin_datastore.c b/src/plugin/datastore/test_plugin_datastore.c
index 7de1acf2d..7de1acf2d 100644
--- a/src/service/datastore/test_plugin_datastore.c
+++ b/src/plugin/datastore/test_plugin_datastore.c
diff --git a/src/service/datastore/test_plugin_datastore_data_heap.conf b/src/plugin/datastore/test_plugin_datastore_data_heap.conf
index b1ea8ff67..b1ea8ff67 100644
--- a/src/service/datastore/test_plugin_datastore_data_heap.conf
+++ b/src/plugin/datastore/test_plugin_datastore_data_heap.conf
diff --git a/src/service/datastore/test_plugin_datastore_data_postgres.conf b/src/plugin/datastore/test_plugin_datastore_data_postgres.conf
index d0e29437f..d0e29437f 100644
--- a/src/service/datastore/test_plugin_datastore_data_postgres.conf
+++ b/src/plugin/datastore/test_plugin_datastore_data_postgres.conf
diff --git a/src/service/datastore/test_plugin_datastore_data_sqlite.conf b/src/plugin/datastore/test_plugin_datastore_data_sqlite.conf
index ca837c77a..ca837c77a 100644
--- a/src/service/datastore/test_plugin_datastore_data_sqlite.conf
+++ b/src/plugin/datastore/test_plugin_datastore_data_sqlite.conf
diff --git a/src/plugin/dht/Makefile.am b/src/plugin/dht/Makefile.am
new file mode 100644
index 000000000..4df810066
--- /dev/null
+++ b/src/plugin/dht/Makefile.am
@@ -0,0 +1,27 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_dht.la
+
+libgnunet_plugin_block_dht_la_SOURCES = \
+  plugin_block_dht.c
+libgnunet_plugin_block_dht_la_LIBADD = \
+  $(top_builddir)/src/lib/hello/libgnunethello.la \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_block_dht_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/dht/meson.build b/src/plugin/dht/meson.build
new file mode 100644
index 000000000..81b829dac
--- /dev/null
+++ b/src/plugin/dht/meson.build
@@ -0,0 +1,9 @@
+shared_module('gnunet_plugin_block_dht',
+        ['plugin_block_dht.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunethello_dep,
+                       libgnunetblock_dep,
+                       libgnunetblockgroup_dep],
+        include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
diff --git a/src/service/dht/plugin_block_dht.c b/src/plugin/dht/plugin_block_dht.c
index aa5ffc719..aa5ffc719 100644
--- a/src/service/dht/plugin_block_dht.c
+++ b/src/plugin/dht/plugin_block_dht.c
diff --git a/src/plugin/dns/Makefile.am b/src/plugin/dns/Makefile.am
new file mode 100644
index 000000000..8b5843159
--- /dev/null
+++ b/src/plugin/dns/Makefile.am
@@ -0,0 +1,25 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_dns.la
+
+libgnunet_plugin_block_dns_la_SOURCES = \
+  plugin_block_dns.c
+libgnunet_plugin_block_dns_la_LIBADD = \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+libgnunet_plugin_block_dns_la_LDFLAGS = \
+  $(GN_LIBINTL) \
+  $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/dns/meson.build b/src/plugin/dns/meson.build
new file mode 100644
index 000000000..974b2c38d
--- /dev/null
+++ b/src/plugin/dns/meson.build
@@ -0,0 +1,6 @@
+shared_module('gnunet_plugin_block_dns',
+        ['plugin_block_dns.c'],
+        dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
diff --git a/src/service/dns/plugin_block_dns.c b/src/plugin/dns/plugin_block_dns.c
index 1bbd7f750..1bbd7f750 100644
--- a/src/service/dns/plugin_block_dns.c
+++ b/src/plugin/dns/plugin_block_dns.c
diff --git a/src/plugin/fs/Makefile.am b/src/plugin/fs/Makefile.am
index 928997e4d..7c0e55cba 100644
--- a/src/plugin/fs/Makefile.am
+++ b/src/plugin/fs/Makefile.am
@@ -20,7 +20,6 @@ libgnunet_plugin_block_fs_la_SOURCES = \
 libgnunet_plugin_block_fs_la_LIBADD = \
   $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/service/fs/libgnunetfs.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_block_fs_la_LDFLAGS = \
diff --git a/src/plugin/gns/Makefile.am b/src/plugin/gns/Makefile.am
index ebbb9aa51..8dc9ef2b2 100644
--- a/src/plugin/gns/Makefile.am
+++ b/src/plugin/gns/Makefile.am
@@ -34,7 +34,6 @@ 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 = \
@@ -47,7 +46,6 @@ 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) \
diff --git a/src/plugin/gns/meson.build b/src/plugin/gns/meson.build
index 0e551b22e..2cdf770f8 100644
--- a/src/plugin/gns/meson.build
+++ b/src/plugin/gns/meson.build
@@ -2,7 +2,7 @@ shared_module('gnunet_plugin_gnsrecord_gns',
         ['plugin_gnsrecord_gns.c'],
         dependencies: [libgnunetutil_dep,
                        libgnunetgnsrecord_dep,
-                       libgnunetidentity_dep],
+                      ],
         include_directories: [incdir, configuration_inc],
         install: true,
         install_dir: get_option('libdir')/'gnunet')
diff --git a/src/plugin/meson.build b/src/plugin/meson.build
index 6ebae59d7..d4f797c54 100644
--- a/src/plugin/meson.build
+++ b/src/plugin/meson.build
@@ -1,9 +1,17 @@
 subdir('block')
-subdir('dhtu')
+subdir('dns')
 subdir('gnsrecord')
+subdir('datacache')
+subdir('datastore')
+subdir('peerstore')
 subdir('namecache')
 subdir('namestore')
+subdir('dht')
+subdir('seti')
+subdir('setu')
+subdir('regex')
 subdir('revocation')
 subdir('gns')
 subdir('fs')
 subdir('reclaim')
+subdir('messenger')
diff --git a/src/plugin/messenger/Makefile.am b/src/plugin/messenger/Makefile.am
new file mode 100644
index 000000000..e3c69ea33
--- /dev/null
+++ b/src/plugin/messenger/Makefile.am
@@ -0,0 +1,26 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_gnsrecord_messenger.la
+
+
+libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
+  plugin_gnsrecord_messenger.c
+libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+
+
+plugindir = $(libdir)/gnunet
diff --git a/src/plugin/messenger/meson.build b/src/plugin/messenger/meson.build
new file mode 100644
index 000000000..17dd9bd32
--- /dev/null
+++ b/src/plugin/messenger/meson.build
@@ -0,0 +1,7 @@
+shared_module('gnunet_plugin_gnsrecord_messenger',
+              ['plugin_gnsrecord_messenger.c'],
+              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep,
+                            ],
+              include_directories: [incdir, configuration_inc],
+              install: true,
+              install_dir: get_option('libdir')/'gnunet')
diff --git a/src/service/messenger/plugin_gnsrecord_messenger.c b/src/plugin/messenger/plugin_gnsrecord_messenger.c
index e09a0330d..e09a0330d 100644
--- a/src/service/messenger/plugin_gnsrecord_messenger.c
+++ b/src/plugin/messenger/plugin_gnsrecord_messenger.c
diff --git a/src/plugin/namecache/Makefile.am b/src/plugin/namecache/Makefile.am
index 0ccbf9ea1..bf8fc9b8d 100644
--- a/src/plugin/namecache/Makefile.am
+++ b/src/plugin/namecache/Makefile.am
@@ -56,10 +56,7 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_namecache_flat_la_SOURCES = \
   plugin_namecache_flat.c
 libgnunet_plugin_namecache_flat_la_LIBADD = \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL)
 libgnunet_plugin_namecache_flat_la_LDFLAGS = \
@@ -68,11 +65,8 @@ libgnunet_plugin_namecache_flat_la_LDFLAGS = \
 libgnunet_plugin_namecache_sqlite_la_SOURCES = \
   plugin_namecache_sqlite.c
 libgnunet_plugin_namecache_sqlite_la_LIBADD = \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
@@ -82,11 +76,8 @@ libgnunet_plugin_namecache_sqlite_la_LDFLAGS = \
 libgnunet_plugin_namecache_postgres_la_SOURCES = \
   plugin_namecache_postgres.c
 libgnunet_plugin_namecache_postgres_la_LIBADD = \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la  \
   $(top_builddir)/src/lib/pq/libgnunetpq.la  \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
   $(LTLIBINTL)
 libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
diff --git a/src/plugin/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
index e413c1b08..03b743d7a 100644
--- a/src/plugin/namestore/Makefile.am
+++ b/src/plugin/namestore/Makefile.am
@@ -76,37 +76,16 @@ TESTS = \
   $(check_SCRIPTS)
 endif
 
-REST_PLUGIN = libgnunet_plugin_rest_namestore.la
-
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN) \
-  $(REST_PLUGIN)
-
-
-libgnunet_plugin_rest_namestore_la_SOURCES = \
-  plugin_rest_namestore.c
-libgnunet_plugin_rest_namestore_la_LIBADD = \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_namestore_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_namestore_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+  $(POSTGRES_PLUGIN)
 
 
 libgnunet_plugin_namestore_sqlite_la_SOURCES = \
   plugin_namestore_sqlite.c
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_namestore_sqlite_la_LDFLAGS = \
@@ -116,9 +95,7 @@ libgnunet_plugin_namestore_postgres_la_SOURCES = \
   plugin_namestore_postgres.c
 libgnunet_plugin_namestore_postgres_la_LIBADD = \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/pq/libgnunetpq.la  \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq \
   $(LTLIBINTL)
 libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
@@ -422,9 +399,6 @@ test_plugin_namestore_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
-check_SCRIPTS = \
-  test_plugin_rest_namestore.sh
-
 EXTRA_DIST = \
   test_common.c \
   test_namestore_api.conf \
@@ -434,5 +408,4 @@ EXTRA_DIST = \
   perf_namestore_api_sqlite.conf \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
-  $(check_SCRIPTS) \
   $(sql_DATA)
diff --git a/src/plugin/namestore/meson.build b/src/plugin/namestore/meson.build
index 32db8c104..d51b4b730 100644
--- a/src/plugin/namestore/meson.build
+++ b/src/plugin/namestore/meson.build
@@ -1,26 +1,10 @@
-shared_module('gnunet_plugin_rest_namestore',
-              ['plugin_rest_namestore.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetgnsrecordjson_dep,
-                             libgnunetgnsrecord_dep,
-                             libgnunetnamestore_dep,
-                             libgnunetjson_dep,
-                             libgnunetutil_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-
+libgnunetpluginnamestore_sqlite_src = ['plugin_namestore_sqlite.c']
 
 shared_module('gnunet_plugin_namestore_sqlite',
         libgnunetpluginnamestore_sqlite_src,
         dependencies: [libgnunetutil_dep,
                        libgnunetgnsrecord_dep,
-                       libgnunetidentity_dep,
                        libgnunetsq_dep,
-                       libgnunetstatistics_dep,
                        sqlite_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
@@ -31,9 +15,7 @@ if pq_dep.found()
           ['plugin_namestore_postgres.c'],
           dependencies: [libgnunetutil_dep,
                          libgnunetgnsrecord_dep,
-                         libgnunetidentity_dep,
                          libgnunetpq_dep,
-                         libgnunetstatistics_dep,
                          pq_dep],
           include_directories: [incdir, configuration_inc],
           install: true,
diff --git a/src/plugin/peerstore/Makefile.am b/src/plugin/peerstore/Makefile.am
new file mode 100644
index 000000000..225e9a71e
--- /dev/null
+++ b/src/plugin/peerstore/Makefile.am
@@ -0,0 +1,67 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+if HAVE_EXPERIMENTAL
+FLAT_PLUGIN = libgnunet_plugin_peerstore_flat.la
+FLAT_TESTS = test_plugin_peerstore_flat
+libgnunet_plugin_peerstore_flat_la_SOURCES = \
+  plugin_peerstore_flat.c
+libgnunet_plugin_peerstore_flat_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_peerstore_flat_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+endif
+
+if HAVE_SQLITE
+SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la
+SQLITE_TESTS = test_plugin_peerstore_sqlite
+libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
+  plugin_peerstore_sqlite.c
+libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
+libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+endif
+
+plugin_LTLIBRARIES = \
+  $(SQLITE_PLUGIN) \
+        $(FLAT_PLUGIN)
+
+test_plugin_peerstore_sqlite_SOURCES = \
+  test_plugin_peerstore.c
+test_plugin_peerstore_sqlite_LDADD = \
+        $(top_builddir)/src/service/testing/libgnunettesting.la \
+        $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_plugin_peerstore_flat_SOURCES = \
+  test_plugin_peerstore.c
+test_plugin_peerstore_flat_LDADD = \
+        $(top_builddir)/src/service/testing/libgnunettesting.la \
+        $(top_builddir)/src/lib/util/libgnunetutil.la
+
+check_PROGRAMS = \
+ $(SQLITE_TESTS) \
+ $(FLAT_TESTS)
+
+EXTRA_DIST = \
+ test_plugin_peerstore_flat.conf \
+ test_plugin_peerstore_sqlite.conf
+
+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_PROGRAMS)
+endif
diff --git a/src/plugin/peerstore/meson.build b/src/plugin/peerstore/meson.build
new file mode 100644
index 000000000..1d22ca798
--- /dev/null
+++ b/src/plugin/peerstore/meson.build
@@ -0,0 +1,9 @@
+shared_module('gnunet_plugin_peerstore_sqlite',
+        ['plugin_peerstore_sqlite.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetsq_dep,
+                       sqlite_dep],
+        include_directories: [incdir,
+                              configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
diff --git a/src/service/peerstore/plugin_peerstore_flat.c b/src/plugin/peerstore/plugin_peerstore_flat.c
index cc5b8b76b..cc304d4db 100644
--- a/src/service/peerstore/plugin_peerstore_flat.c
+++ b/src/plugin/peerstore/plugin_peerstore_flat.c
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_peerstore_plugin.h"
 #include "gnunet_peerstore_service.h"
-#include "peerstore.h"
+#include "../../service/peerstore/peerstore.h"
 
 /**
  * Context for all functions in this plugin.
diff --git a/src/service/peerstore/plugin_peerstore_sqlite.c b/src/plugin/peerstore/plugin_peerstore_sqlite.c
index ad69efdf4..7d06d2c63 100644
--- a/src/service/peerstore/plugin_peerstore_sqlite.c
+++ b/src/plugin/peerstore/plugin_peerstore_sqlite.c
@@ -29,7 +29,7 @@
 #include "gnunet_peerstore_plugin.h"
 #include "gnunet_peerstore_service.h"
 #include "gnunet_sq_lib.h"
-#include "peerstore.h"
+#include "../../service/peerstore/peerstore.h"
 #include <sqlite3.h>
 
 /**
diff --git a/src/service/peerstore/test_plugin_peerstore.c b/src/plugin/peerstore/test_plugin_peerstore.c
index bce62dda9..bce62dda9 100644
--- a/src/service/peerstore/test_plugin_peerstore.c
+++ b/src/plugin/peerstore/test_plugin_peerstore.c
diff --git a/src/service/peerstore/test_plugin_peerstore_flat.conf b/src/plugin/peerstore/test_plugin_peerstore_flat.conf
index c55b1e9d6..c55b1e9d6 100644
--- a/src/service/peerstore/test_plugin_peerstore_flat.conf
+++ b/src/plugin/peerstore/test_plugin_peerstore_flat.conf
diff --git a/src/service/peerstore/test_plugin_peerstore_sqlite.conf b/src/plugin/peerstore/test_plugin_peerstore_sqlite.conf
index dcf1fc1a4..dcf1fc1a4 100644
--- a/src/service/peerstore/test_plugin_peerstore_sqlite.conf
+++ b/src/plugin/peerstore/test_plugin_peerstore_sqlite.conf
diff --git a/src/plugin/reclaim/Makefile.am b/src/plugin/reclaim/Makefile.am
index 0b5159c6b..e8ac2f94d 100644
--- a/src/plugin/reclaim/Makefile.am
+++ b/src/plugin/reclaim/Makefile.am
@@ -59,11 +59,11 @@ endif
 
 
 libgnunet_plugin_reclaim_credential_jwt_la_SOURCES = \
-  plugin_reclaim_credential_jwt.c
+  plugin_reclaim_credential_jwt.c \
+        $(top_builddir)/src/service/reclaim/reclaim_attribute.c \
+        $(top_builddir)/src/service/reclaim/reclaim_credential.c
 libgnunet_plugin_reclaim_credential_jwt_la_LIBADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
   -ljansson\
   $(LTLIBINTL)
 libgnunet_plugin_reclaim_credential_jwt_la_LDFLAGS = \
diff --git a/src/plugin/reclaim/meson.build b/src/plugin/reclaim/meson.build
index 51346b108..df0289ca2 100644
--- a/src/plugin/reclaim/meson.build
+++ b/src/plugin/reclaim/meson.build
@@ -7,9 +7,7 @@ shared_module('gnunet_plugin_gnsrecord_reclaim',
 
 shared_module('gnunet_plugin_reclaim_attribute_basic',
               ['plugin_reclaim_attribute_basic.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetreclaim_dep,
+              dependencies: [
                              libgnunetjson_dep,
                              libgnunetutil_dep,
                              json_dep],
@@ -18,9 +16,7 @@ shared_module('gnunet_plugin_reclaim_attribute_basic',
               install_dir: get_option('libdir') / 'gnunet')
 shared_module('gnunet_plugin_reclaim_credential_jwt',
               ['plugin_reclaim_credential_jwt.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetreclaim_dep,
+              dependencies: [
                              libgnunetjson_dep,
                              libgnunetutil_dep,
                              json_dep],
diff --git a/src/plugin/regex/Makefile.am b/src/plugin/regex/Makefile.am
new file mode 100644
index 000000000..a39cfc927
--- /dev/null
+++ b/src/plugin/regex/Makefile.am
@@ -0,0 +1,40 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+lib_LTLIBRARIES = \
+  libgnunetregexblock.la
+
+libgnunetregexblock_la_SOURCES = \
+  regex_block_lib.c regex_block_lib.h
+libgnunetregexblock_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(XLIB) \
+  $(LTLIBINTL)
+libgnunetregexblock_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  \
+  -version-info 1:0:0
+
+
+plugin_LTLIBRARIES = \
+ libgnunet_plugin_block_regex.la
+
+libgnunet_plugin_block_regex_la_SOURCES = \
+ plugin_block_regex.c
+libgnunet_plugin_block_regex_la_LIBADD = \
+ libgnunetregexblock.la \
+ $(top_builddir)/src/lib/block/libgnunetblock.la \
+ $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+libgnunet_plugin_block_regex_la_LDFLAGS = \
+ $(GN_LIBINTL) \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/regex/meson.build b/src/plugin/regex/meson.build
new file mode 100644
index 000000000..0e1b4b08d
--- /dev/null
+++ b/src/plugin/regex/meson.build
@@ -0,0 +1,23 @@
+libgnunetregexblock_src = ['regex_block_lib.c']
+
+libgnunetregexblock = library('gnunetregexblock',
+        libgnunetregexblock_src,
+        soversion: '1',
+        version: '1.0.0',
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetregexblock_dep = declare_dependency(link_with : libgnunetregexblock)
+
+shared_module('gnunet_plugin_block_regex',
+        ['plugin_block_regex.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetregexblock_dep,
+                       libgnunetblock_dep,
+                       libgnunetblockgroup_dep],
+        include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+
+
diff --git a/src/service/regex/plugin_block_regex.c b/src/plugin/regex/plugin_block_regex.c
index 5f23a32df..5f23a32df 100644
--- a/src/service/regex/plugin_block_regex.c
+++ b/src/plugin/regex/plugin_block_regex.c
diff --git a/src/service/regex/regex_block_lib.c b/src/plugin/regex/regex_block_lib.c
index 048d6d743..048d6d743 100644
--- a/src/service/regex/regex_block_lib.c
+++ b/src/plugin/regex/regex_block_lib.c
diff --git a/src/service/regex/regex_block_lib.h b/src/plugin/regex/regex_block_lib.h
index 11029b9af..11029b9af 100644
--- a/src/service/regex/regex_block_lib.h
+++ b/src/plugin/regex/regex_block_lib.h
diff --git a/src/plugin/revocation/Makefile.am b/src/plugin/revocation/Makefile.am
index db6df02c9..99373f8d7 100644
--- a/src/plugin/revocation/Makefile.am
+++ b/src/plugin/revocation/Makefile.am
@@ -18,11 +18,10 @@ plugin_LTLIBRARIES = \
 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/gnsrecord/libgnunetgnsrecord.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/plugin/revocation/meson.build b/src/plugin/revocation/meson.build
index 7f8c8ec5e..c4405e9b8 100644
--- a/src/plugin/revocation/meson.build
+++ b/src/plugin/revocation/meson.build
@@ -1,8 +1,6 @@
 shared_module('gnunet_plugin_block_revocation',
               ['plugin_block_revocation.c'],
               dependencies: [libgnunetutil_dep,
-                             libgnunetidentity_dep,
-                             libgnunetrevocation_dep,
                              libgnunetblock_dep],
               include_directories: [incdir, configuration_inc],
               install: true,
diff --git a/src/plugin/revocation/plugin_block_revocation.c b/src/plugin/revocation/plugin_block_revocation.c
index 4c5991507..c4332184e 100644
--- a/src/plugin/revocation/plugin_block_revocation.c
+++ b/src/plugin/revocation/plugin_block_revocation.c
@@ -27,8 +27,8 @@
 #include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet_block_plugin.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_block_group_lib.h"
-// FIXME try to avoid this include somehow
 #include "../../service/revocation/revocation.h"
 #include "gnunet_revocation_service.h"
 
@@ -93,8 +93,8 @@ block_plugin_revocation_check_block (void *cls,
 {
   struct InternalContext *ic = cls;
   const struct RevokeMessage *rm = block;
-  const struct GNUNET_REVOCATION_PowP *pow
-    = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
+  const struct GNUNET_GNSRECORD_PowP *pow
+    = (const struct GNUNET_GNSRECORD_PowP *) &rm[1];
   struct GNUNET_CRYPTO_PublicKey pk;
   size_t pklen;
   size_t left;
@@ -117,9 +117,9 @@ block_plugin_revocation_check_block (void *cls,
   left = block_size - sizeof (*rm) - sizeof (*pow);
   if (GNUNET_SYSERR ==
       GNUNET_CRYPTO_read_public_key_from_buffer (&pow[1],
-                                                   left,
-                                                   &pk,
-                                                   &pklen))
+                                                 left,
+                                                 &pk,
+                                                 &pklen))
   {
     GNUNET_break_op (0);
     return GNUNET_NO;
@@ -130,9 +130,9 @@ block_plugin_revocation_check_block (void *cls,
     return GNUNET_NO;
   }
   if (GNUNET_YES !=
-      GNUNET_REVOCATION_check_pow (pow,
-                                   ic->matching_bits,
-                                   ic->epoch_duration))
+      GNUNET_GNSRECORD_check_pow (pow,
+                                  ic->matching_bits,
+                                  ic->epoch_duration))
   {
     GNUNET_break_op (0);
     return GNUNET_NO;
@@ -203,8 +203,8 @@ block_plugin_revocation_get_key (void *cls,
                                  struct GNUNET_HashCode *key)
 {
   const struct RevokeMessage *rm = block;
-  const struct GNUNET_REVOCATION_PowP *pow
-    = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
+  const struct GNUNET_GNSRECORD_PowP *pow
+    = (const struct GNUNET_GNSRECORD_PowP *) &rm[1];
   struct GNUNET_CRYPTO_PublicKey pk;
   size_t pklen;
   size_t left;
@@ -226,9 +226,9 @@ block_plugin_revocation_get_key (void *cls,
   }
   left = block_size - sizeof (*rm) - sizeof (*pow);
   if (GNUNET_SYSERR == GNUNET_CRYPTO_read_public_key_from_buffer (&pow[1],
-                                                                    left,
-                                                                    &pk,
-                                                                    &pklen))
+                                                                  left,
+                                                                  &pk,
+                                                                  &pklen))
   {
     GNUNET_break_op (0);
     return GNUNET_NO;
diff --git a/src/plugin/seti/Makefile.am b/src/plugin/seti/Makefile.am
new file mode 100644
index 000000000..e6f579a65
--- /dev/null
+++ b/src/plugin/seti/Makefile.am
@@ -0,0 +1,25 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_seti_test.la
+
+libgnunet_plugin_block_seti_test_la_SOURCES = \
+  plugin_block_seti_test.c
+libgnunet_plugin_block_seti_test_la_LIBADD = \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_block_seti_test_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/seti/meson.build b/src/plugin/seti/meson.build
new file mode 100644
index 000000000..880936164
--- /dev/null
+++ b/src/plugin/seti/meson.build
@@ -0,0 +1,7 @@
+shared_module('gnunet_plugin_block_seti_test',
+              ['plugin_block_seti_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+
diff --git a/src/service/seti/plugin_block_seti_test.c b/src/plugin/seti/plugin_block_seti_test.c
index 5b9196cef..5b9196cef 100644
--- a/src/service/seti/plugin_block_seti_test.c
+++ b/src/plugin/seti/plugin_block_seti_test.c
diff --git a/src/plugin/setu/Makefile.am b/src/plugin/setu/Makefile.am
new file mode 100644
index 000000000..90a14cce0
--- /dev/null
+++ b/src/plugin/setu/Makefile.am
@@ -0,0 +1,21 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_setu_test.la
+
+libgnunet_plugin_block_setu_test_la_SOURCES = \
+  plugin_block_setu_test.c
+libgnunet_plugin_block_setu_test_la_LIBADD = \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunet_plugin_block_setu_test_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/setu/meson.build b/src/plugin/setu/meson.build
new file mode 100644
index 000000000..e22738ab6
--- /dev/null
+++ b/src/plugin/setu/meson.build
@@ -0,0 +1,7 @@
+shared_module('gnunet_plugin_block_setu_test',
+              ['plugin_block_setu_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+
diff --git a/src/service/setu/plugin_block_setu_test.c b/src/plugin/setu/plugin_block_setu_test.c
index 178ad3314..178ad3314 100644
--- a/src/service/setu/plugin_block_setu_test.c
+++ b/src/plugin/setu/plugin_block_setu_test.c
diff --git a/src/rest-plugin/Makefile.am b/src/rest-plugin/Makefile.am
deleted file mode 100644
index d76972b78..000000000
--- a/src/rest-plugin/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = \
-        rest \
-        identity \
-        gns \
-        reclaim
diff --git a/src/rest-plugin/gns/Makefile.am b/src/rest-plugin/gns/Makefile.am
deleted file mode 100644
index 48b278df6..000000000
--- a/src/rest-plugin/gns/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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/rest-plugin/gns/meson.build b/src/rest-plugin/gns/meson.build
deleted file mode 100644
index 7a4deffed..000000000
--- a/src/rest-plugin/gns/meson.build
+++ /dev/null
@@ -1,13 +0,0 @@
-shared_module('gnunet_plugin_rest_gns',
-              ['plugin_rest_gns.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetgnsrecord_dep,
-                             libgnunetgnsrecordjson_dep,
-                             libgnunetgns_dep,
-                             libgnunetutil_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-
diff --git a/src/rest-plugin/gns/test_plugin_rest_gns.sh b/src/rest-plugin/gns/test_plugin_rest_gns.sh
deleted file mode 100755
index 3bcfb5a08..000000000
--- a/src/rest-plugin/gns/test_plugin_rest_gns.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# This file is in the public domain.
-trap "gnunet-arm -e -c test_gns_lookup.conf" INT
-LOCATION=$(which gnunet-config)
-if [ -z $LOCATION ]
-then
-  LOCATION="gnunet-config"
-fi
-$LOCATION --version 1> /dev/null
-if test $? != 0
-then
-        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
-        exit 77
-fi
-
-rm -rf `gnunet-config -c test_gns_lookup.conf -f -s paths -o GNUNET_TEST_HOME`
-
-gns_link="http://localhost:7776/gns"
-wrong_link="http://localhost:7776/gnsandmore"
-
-curl_get () {
-    #$1 is link
-    #$2 is grep
-    XURL=`which curl`
-    if [ "" = "$XURL" ]
-    then
-        echo "HTTP client (curl) not found, exiting"
-        exit 77
-    fi
-    sleep 0.5
-    cache="$(${XURL} -v "$1" 2>&1 | grep "$2")"
-    #echo "$cache"
-    if [ "" = "$cache" ]
-    then
-        gnunet-identity -D "$TEST_TLD" -c test_gns_lookup.conf > /dev/null 2>&1
-        gnunet-arm -e -c test_gns_lookup.conf
-        echo "Download of $1 using $XURL failed, expected $2"
-        exit 1
-    fi
-}
-TEST_TLD="testtld"
-
-gnunet-arm -s -c test_gns_lookup.conf
-
-curl_get "$gns_link/www.$TEST_TLD" "error"
-
-gnunet-identity -C "$TEST_TLD"  -c test_gns_lookup.conf
-sleep 0.5
-curl_get "$gns_link/www.$TEST_TLD" "\[\]"
-
-gnunet-namestore -z "$TEST_TLD" -p -a -n www -e 1d -V 1.1.1.1 -t A -c test_gns_lookup.conf
-
-curl_get "$gns_link/www.$TEST_TLD" "1.1.1.1"
-
-gnunet-namestore -z "$TEST_TLD" -p -a -n www -e 1d -V 1::1 -t AAAA -c test_gns_lookup.conf
-
-curl_get "$gns_link/www.$TEST_TLD" "1::1.*1.1.1.1"
-
-gnunet-namestore -z "$TEST_TLD" -p -a -n www -e 1d -V 1.1.1.2 -t A -c test_gns_lookup.conf
-
-curl_get "$gns_link/www.$TEST_TLD" "1.1.1.2.*1::1.*1.1.1.1"
-curl_get "$gns_link/www.$TEST_TLD?record_type=A" "1.1.1.2.*1.1.1.1"
-curl_get "$gns_link/www.$TEST_TLD?record_type=AAAA" "1::1"
-curl_get "$gns_link/www.$TEST_TLD?record_type=WRONG_TYPE" "1.1.1.2.*1::1.*1.1.1.1"
-
-gnunet-namestore -z "$TEST_TLD" -p -a -n www1 -e 1d -V 1.1.1.1 -t A -c test_gns_lookup.conf
-curl_get "$gns_link/www1.$TEST_TLD" "1.1.1.1"
-
-gnunet-namestore -z "$TEST_TLD" -d -n www1 -c test_gns_lookup.conf
-gnunet-namestore -z "$TEST_TLD" -d -n www -c test_gns_lookup.conf
-
-gnunet-identity -D "$TEST_TLD" -c test_gns_lookup.conf > /dev/null 2>&1
-
-curl_get "$gns_link/www1.$TEST_TLD" "error"
-gnunet-arm -e -c test_gns_lookup.conf
-exit 0
diff --git a/src/rest-plugin/identity/Makefile.am b/src/rest-plugin/identity/Makefile.am
deleted file mode 100644
index bcad0c2dd..000000000
--- a/src/rest-plugin/identity/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
-
-plugin_LTLIBRARIES = libgnunet_plugin_rest_identity.la
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-libgnunet_plugin_rest_identity_la_SOURCES = \
-  plugin_rest_identity.c
-libgnunet_plugin_rest_identity_la_LIBADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_identity_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_identity_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
diff --git a/src/rest-plugin/identity/meson.build b/src/rest-plugin/identity/meson.build
deleted file mode 100644
index f459918db..000000000
--- a/src/rest-plugin/identity/meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
-shared_module('gnunet_plugin_rest_identity',
-              ['plugin_rest_identity.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetutil_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-
diff --git a/src/rest-plugin/meson.build b/src/rest-plugin/meson.build
deleted file mode 100644
index 31d49864e..000000000
--- a/src/rest-plugin/meson.build
+++ /dev/null
@@ -1,6 +0,0 @@
-if get_option('monolith') == false
-  subdir('rest')
-endif
-subdir('identity')
-subdir('gns')
-subdir('reclaim')
diff --git a/src/rest-plugin/reclaim/Makefile.am b/src/rest-plugin/reclaim/Makefile.am
deleted file mode 100644
index 7bc305bef..000000000
--- a/src/rest-plugin/reclaim/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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
-
-
-REST_PLUGIN = \
-  libgnunet_plugin_rest_reclaim.la
-
-if HAVE_JOSE
-REST_PLUGIN += libgnunet_plugin_rest_openid_connect.la
-endif
-
-if HAVE_PABC
-  REST_PLUGIN += libgnunet_plugin_rest_pabc.la
-endif
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-plugin_LTLIBRARIES = \
-  $(REST_PLUGIN)
-
-libgnunet_plugin_rest_reclaim_la_SOURCES = \
-  plugin_rest_reclaim.c \
-  json_reclaim.h \
-  json_reclaim.c
-libgnunet_plugin_rest_reclaim_la_LIBADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson $(MHD_LIBS)
-libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_reclaim_la_CFLAGS = \
-        $(MHD_CFLAGS) $(AM_CFLAGS)
-
-if HAVE_JOSE
-libgnunet_plugin_rest_openid_connect_la_SOURCES = \
-  plugin_rest_openid_connect.c \
-  oidc_helper.h \
-  oidc_helper.c
-libgnunet_plugin_rest_openid_connect_la_LIBADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.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) \
-        $(LIBGCRYPT_LIBS)
-libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_openid_connect_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
-
-if HAVE_PABC
-libgnunet_plugin_rest_pabc_la_SOURCES = \
-  plugin_rest_pabc.c \
-  $(top_builddir)/src/plugin/reclaim/pabc_helper.c
-libgnunet_plugin_rest_pabc_la_LIBADD = \
-  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) -ljansson -lpabc $(MHD_LIBS)
-libgnunet_plugin_rest_pabc_la_LDFLAGS = \
-  $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_pabc_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-endif
diff --git a/src/rest-plugin/reclaim/meson.build b/src/rest-plugin/reclaim/meson.build
deleted file mode 100644
index da4406850..000000000
--- a/src/rest-plugin/reclaim/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-shared_module('gnunet_plugin_rest_reclaim',
-              ['plugin_rest_reclaim.c', 'json_reclaim.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetidentity_dep,
-                             libgnunetreclaim_dep,
-                             libgnunetjson_dep,
-                             libgnunetutil_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-
-shared_module('gnunet_plugin_rest_openid_connect',
-              ['plugin_rest_openid_connect.c', 'oidc_helper.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetreclaim_dep,
-                             libgnunetidentity_dep,
-                             libgnunetgns_dep,
-                             libgnunetutil_dep,
-                             jose_dep,
-                             gcrypt_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-
-
diff --git a/src/rest-plugin/rest/Makefile.am b/src/rest-plugin/rest/Makefile.am
deleted file mode 100644
index 4f7f834fb..000000000
--- a/src/rest-plugin/rest/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIBS = -lgcov
-endif
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_rest_copying.la \
-  libgnunet_plugin_rest_config.la
-
-libgnunet_plugin_rest_copying_la_SOURCES = \
-  plugin_rest_copying.c
-libgnunet_plugin_rest_copying_la_LIBADD = \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) $(MHD_LIBS)
-libgnunet_plugin_rest_copying_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_copying_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-libgnunet_plugin_rest_config_la_SOURCES = \
-  plugin_rest_config.c
-libgnunet_plugin_rest_config_la_LIBADD = \
-  $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL) $(MHD_LIBS) -ljansson
-libgnunet_plugin_rest_config_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-libgnunet_plugin_rest_config_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
diff --git a/src/rest-plugin/rest/meson.build b/src/rest-plugin/rest/meson.build
deleted file mode 100644
index 0c7219327..000000000
--- a/src/rest-plugin/rest/meson.build
+++ /dev/null
@@ -1,18 +0,0 @@
-shared_module('gnunet_plugin_rest_config',
-              ['plugin_rest_config.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetutil_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
-shared_module('gnunet_plugin_rest_copying',
-              ['plugin_rest_copying.c'],
-              dependencies: [libgnunetrest_dep,
-                             libgnunetutil_dep,
-                             json_dep,
-                             mhd_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir') / 'gnunet')
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 8e661e432..041442725 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -13,9 +13,9 @@ SUBDIRS = \
   topology \
   dns \
         identity \
-        rest \
         datacache \
         datastore \
+        dhtu \
         dht \
   namecache \
   namestore \
@@ -31,5 +31,6 @@ SUBDIRS = \
         exit \
         pt \
         reclaim \
-        messenger
+        messenger \
+        rest
 
diff --git a/src/service/datacache/Makefile.am b/src/service/datacache/Makefile.am
index 9caeac543..022b45253 100644
--- a/src/service/datacache/Makefile.am
+++ b/src/service/datacache/Makefile.am
@@ -8,25 +8,11 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 dist_pkgcfg_DATA = \
   datacache.conf
 
-sqldir = $(prefix)/share/gnunet/sql/
-
-sql_DATA = \
-  datacache-0001.sql \
-  datacache-drop.sql
-
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
   XLIBS = -lgcov
 endif
 
-if HAVE_SQLITE
-  SQLITE_PLUGIN = libgnunet_plugin_datacache_sqlite.la
-endif
-if HAVE_POSTGRESQL
-  POSTGRES_PLUGIN = libgnunet_plugin_datacache_postgres.la
-endif
-
 lib_LTLIBRARIES = \
   libgnunetdatacache.la
 
@@ -41,57 +27,6 @@ libgnunetdatacache_la_LDFLAGS = \
   -version-info 0:1:0
 
 
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN) \
-  libgnunet_plugin_datacache_heap.la
-
-# Real plugins should of course go into
-# plugin_LTLIBRARIES
-noinst_LTLIBRARIES = \
-  libgnunet_plugin_datacache_template.la
-
-
-libgnunet_plugin_datacache_sqlite_la_SOURCES = \
-  plugin_datacache_sqlite.c
-libgnunet_plugin_datacache_sqlite_la_LIBADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_datacache_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_datacache_heap_la_SOURCES = \
-  plugin_datacache_heap.c
-libgnunet_plugin_datacache_heap_la_LIBADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datacache_heap_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-libgnunet_plugin_datacache_postgres_la_SOURCES = \
-  plugin_datacache_postgres.c
-libgnunet_plugin_datacache_postgres_la_LIBADD = \
-  $(top_builddir)/src/lib/pq/libgnunetpq.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_PLUGIN_LDFLAGS) -lpq
-libgnunet_plugin_datacache_postgres_la_CPPFLAGS = \
- $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
-libgnunet_plugin_datacache_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-
-libgnunet_plugin_datacache_template_la_SOURCES = \
-  plugin_datacache_template.c
-libgnunet_plugin_datacache_template_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datacache_template_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 if HAVE_SQLITE
 SQLITE_TESTS = \
  test_datacache_sqlite \
@@ -166,5 +101,4 @@ test_datacache_quota_postgres_LDADD = \
 EXTRA_DIST = \
  test_datacache_data_sqlite.conf \
  test_datacache_data_heap.conf \
- test_datacache_data_postgres.conf \
- $(sql_DATA)
+ test_datacache_data_postgres.conf
diff --git a/src/service/datacache/meson.build b/src/service/datacache/meson.build
index 528885c0d..f50036c03 100644
--- a/src/service/datacache/meson.build
+++ b/src/service/datacache/meson.build
@@ -5,9 +5,6 @@ configure_file(input : 'datacache.conf',
                configuration : cdata,
                install: true,
                install_dir: pkgcfgdir)
-install_data ('datacache-0001.sql',
-              'datacache-drop.sql',
-               install_dir: get_option('datadir')/'gnunet'/'sql')
 
 if get_option('monolith')
   foreach p : libgnunetdatacache_src
@@ -27,36 +24,6 @@ libgnunetdatacache_dep = declare_dependency(link_with : libgnunetdatacache)
 pkg.generate(libgnunetdatacache, url: 'https://www.gnunet.org',
              description : 'Provides datacache API for temporary storage to disk')
 
-shared_module('gnunet_plugin_datacache_sqlite',
-        ['plugin_datacache_sqlite.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetdatacache_dep,
-                       sqlite_dep,
-                       libgnunetsq_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir')/'gnunet')
-
-shared_module('gnunet_plugin_datacache_heap',
-        ['plugin_datacache_heap.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetdatacache_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir')/'gnunet')
-
-if pq_dep.found()
-  shared_module('gnunet_plugin_datacache_postgres',
-          ['plugin_datacache_postgres.c'],
-          dependencies: [libgnunetutil_dep,
-                         libgnunetdatacache_dep,
-                         pq_dep,
-                         libgnunetpq_dep],
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir')/'gnunet')
-endif
-
 testdc_sqlite = executable ('test_datacache_sqlite',
             ['test_datacache.c'],
             dependencies: [
diff --git a/src/service/datastore/Makefile.am b/src/service/datastore/Makefile.am
index 9ae5004c6..22f98482a 100644
--- a/src/service/datastore/Makefile.am
+++ b/src/service/datastore/Makefile.am
@@ -10,12 +10,6 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   datastore.conf
 
-sqldir = $(prefix)/share/gnunet/sql/
-
-sql_DATA = \
-  datastore-0001.sql \
-  datastore-drop.sql
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
   XLIBS = -lgcov
@@ -46,89 +40,30 @@ gnunet_service_datastore_LDADD = \
   $(GN_LIBINTL)
 
 if HAVE_SQLITE
- SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
 if HAVE_BENCHMARKS
   SQLITE_BENCHMARKS = \
-   perf_datastore_api_sqlite \
-   perf_plugin_datastore_sqlite
+   perf_datastore_api_sqlite
 endif
  SQLITE_TESTS = \
   test_datastore_api_sqlite \
   test_datastore_api_management_sqlite \
-  test_plugin_datastore_sqlite \
   $(SQLITE_BENCHMARKS)
 endif
 if HAVE_POSTGRESQL
- POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la
 if HAVE_BENCHMARKS
   POSTGRES_BENCHMARKS = \
-   perf_datastore_api_postgres \
-   perf_plugin_datastore_postgres
+   perf_datastore_api_postgres
 endif
  POSTGRES_TESTS = \
   test_datastore_api_postgres \
   test_datastore_api_management_postgres \
-  test_plugin_datastore_postgres \
   $(POSTGRES_BENCHMARKS)
 endif
 
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-  $(POSTGRES_PLUGIN) \
-  libgnunet_plugin_datastore_heap.la
-
-# Real plugins should of course go into
-# plugin_LTLIBRARIES
-noinst_LTLIBRARIES = \
-  libgnunet_plugin_datastore_template.la
-
-
-libgnunet_plugin_datastore_sqlite_la_SOURCES = \
-  plugin_datastore_sqlite.c
-libgnunet_plugin_datastore_sqlite_la_LIBADD = \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_datastore_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_datastore_heap_la_SOURCES = \
-  plugin_datastore_heap.c
-libgnunet_plugin_datastore_heap_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datastore_heap_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-libgnunet_plugin_datastore_postgres_la_SOURCES = \
-  plugin_datastore_postgres.c
-libgnunet_plugin_datastore_postgres_la_LIBADD = \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/pq/libgnunetpq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) -lpq
-libgnunet_plugin_datastore_postgres_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
-libgnunet_plugin_datastore_postgres_la_CPPFLAGS = \
- $(POSTGRESQL_CPPFLAGS) $(AM_CPPFLAGS)
-
-
-libgnunet_plugin_datastore_template_la_SOURCES = \
-  plugin_datastore_template.c
-libgnunet_plugin_datastore_template_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_datastore_template_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
 check_PROGRAMS = \
   test_datastore_api_heap \
   test_datastore_api_management_heap \
   perf_datastore_api_heap \
-  perf_plugin_datastore_heap \
-  test_plugin_datastore_heap \
   $(SQLITE_TESTS) \
   $(POSTGRES_TESTS)
 
@@ -158,19 +93,6 @@ perf_datastore_api_heap_LDADD = \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
-perf_plugin_datastore_heap_SOURCES = \
- perf_plugin_datastore.c
-perf_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_datastore_heap_SOURCES = \
- test_plugin_datastore.c
-test_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
 test_datastore_api_sqlite_SOURCES = \
  test_datastore_api.c
 test_datastore_api_sqlite_LDADD = \
@@ -192,19 +114,6 @@ perf_datastore_api_sqlite_LDADD = \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
-perf_plugin_datastore_sqlite_SOURCES = \
- perf_plugin_datastore.c
-perf_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_datastore_sqlite_SOURCES = \
- test_plugin_datastore.c
-test_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
 test_datastore_api_postgres_SOURCES = \
  test_datastore_api.c
 test_datastore_api_postgres_LDADD = \
@@ -226,28 +135,8 @@ perf_datastore_api_postgres_LDADD = \
  libgnunetdatastore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
-test_plugin_datastore_postgres_SOURCES = \
- test_plugin_datastore.c
-test_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-perf_plugin_datastore_postgres_SOURCES = \
- perf_plugin_datastore.c
-perf_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-
 EXTRA_DIST = \
  test_defaults.conf \
  test_datastore_api_data_sqlite.conf \
- perf_plugin_datastore_data_sqlite.conf \
- test_plugin_datastore_data_sqlite.conf \
  test_datastore_api_data_heap.conf \
- perf_plugin_datastore_data_heap.conf \
- test_plugin_datastore_data_heap.conf \
- test_datastore_api_data_postgres.conf \
- perf_plugin_datastore_data_postgres.conf \
- test_plugin_datastore_data_postgres.conf \
- $(sql_DATA)
+ test_datastore_api_data_postgres.conf
diff --git a/src/service/datastore/meson.build b/src/service/datastore/meson.build
index 9dde488a0..b81d8bb86 100644
--- a/src/service/datastore/meson.build
+++ b/src/service/datastore/meson.build
@@ -8,10 +8,6 @@ configure_file(input : 'datastore.conf.in',
                install: true,
                install_dir: pkgcfgdir)
 
-install_data ('datastore-0001.sql',
-              'datastore-drop.sql',
-               install_dir: get_option('datadir')/'gnunet'/'sql')
-
 if get_option('monolith')
   foreach p : libgnunetdatastore_src + gnunetservicedatastore_src
     gnunet_src += 'datastore/' + p
@@ -32,36 +28,6 @@ libgnunetdatastore_dep = declare_dependency(link_with : libgnunetdatastore)
 pkg.generate(libgnunetdatastore, url: 'https://www.gnunet.org',
              description : 'Management API for the datastore for persistent storage to disk')
 
-shared_module('gnunet_plugin_datastore_sqlite',
-        ['plugin_datastore_sqlite.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetdatastore_dep,
-                       sqlite_dep,
-                       libgnunetsq_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir')/'gnunet')
-
-shared_module('gnunet_plugin_datastore_heap',
-        ['plugin_datastore_heap.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetdatacache_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir')/'gnunet')
-
-if pq_dep.found()
-  shared_module('gnunet_plugin_datastore_postgres',
-          ['plugin_datastore_postgres.c'],
-          dependencies: [libgnunetutil_dep,
-                         libgnunetdatastore_dep,
-                         pq_dep,
-                         libgnunetpq_dep],
-          include_directories: [incdir, configuration_inc],
-          install: true,
-          install_dir: get_option('libdir')/'gnunet')
-endif
-
 executable ('gnunet-service-datastore',
             gnunetservicedatastore_src,
             dependencies: [libgnunetdatastore_dep,
@@ -92,16 +58,6 @@ testds_mgmt_sqlite = executable ('test_datastore_api_management_sqlite',
             include_directories: [incdir, configuration_inc],
             install: false)
 
-testds_plugin_sqlite = executable ('test_plugin_datastore_sqlite',
-            ['test_plugin_datastore.c'],
-            dependencies: [
-              libgnunetdatastore_dep,
-              libgnunetutil_dep,
-              libgnunettesting_dep
-              ],
-            include_directories: [incdir, configuration_inc],
-            install: false)
-
 testds_heap = executable ('test_datastore_api_heap',
             ['test_datastore_api.c'],
             dependencies: [
@@ -122,16 +78,6 @@ testds_mgmt_heap = executable ('test_datastore_api_management_heap',
             include_directories: [incdir, configuration_inc],
             install: false)
 
-testds_plugin_heap = executable ('test_plugin_datastore_heap',
-            ['test_plugin_datastore.c'],
-            dependencies: [
-              libgnunetdatastore_dep,
-              libgnunetutil_dep,
-              libgnunettesting_dep
-              ],
-            include_directories: [incdir, configuration_inc],
-            install: false)
-
 testds_pq = executable ('test_datastore_api_postgres',
             ['test_datastore_api.c'],
             dependencies: [
@@ -142,16 +88,6 @@ testds_pq = executable ('test_datastore_api_postgres',
             include_directories: [incdir, configuration_inc],
             install: false)
 
-testds_plugin_pq = executable ('test_plugin_datastore_postgres',
-            ['test_plugin_datastore.c'],
-            dependencies: [
-              libgnunetdatastore_dep,
-              libgnunetutil_dep,
-              libgnunettesting_dep
-              ],
-            include_directories: [incdir, configuration_inc],
-            install: false)
-
 testds_mgmt_pq = executable ('test_datastore_api_management_postgres',
             ['test_datastore_api_management.c'],
             dependencies: [
@@ -179,18 +115,12 @@ test('test_datastore_api_sqlite', testds_sqlite,
   suite: 'datastore', workdir: meson.current_build_dir())
 test('test_datastore_api_management_sqlite', testds_mgmt_sqlite,
   suite: 'datastore', workdir: meson.current_build_dir())
-test('test_plugin_datastore_sqlite', testds_plugin_sqlite,
-  suite: 'datastore', workdir: meson.current_build_dir())
 test('test_datastore_api_heap', testds_heap,
   suite: 'datastore', workdir: meson.current_build_dir())
 test('test_datastore_api_management_heap', testds_mgmt_heap,
   suite: 'datastore', workdir: meson.current_build_dir())
-test('test_plugin_datastore_heap', testds_plugin_heap,
-  suite: 'datastore', workdir: meson.current_build_dir())
 test('test_datastore_api_postgres', testds_pq,
   suite: 'datastore', workdir: meson.current_build_dir())
 test('test_datastore_api_management_postgres', testds_mgmt_pq,
   suite: 'datastore', workdir: meson.current_build_dir())
-test('test_plugin_datastore_postgres', testds_plugin_pq,
-  suite: 'datastore', workdir: meson.current_build_dir())
 
diff --git a/src/service/dht/Makefile.am b/src/service/dht/Makefile.am
index bf3d26235..53df04faf 100644
--- a/src/service/dht/Makefile.am
+++ b/src/service/dht/Makefile.am
@@ -29,21 +29,6 @@ libgnunetdht_la_LDFLAGS = \
   -version-info 4:0:0
 
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la
-
-libgnunet_plugin_block_dht_la_SOURCES = \
-  plugin_block_dht.c
-libgnunet_plugin_block_dht_la_LIBADD = \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_dht_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 libexec_PROGRAMS = \
  gnunet-service-dht
 
diff --git a/src/service/dht/meson.build b/src/service/dht/meson.build
index 49ace7e0b..3972a0983 100644
--- a/src/service/dht/meson.build
+++ b/src/service/dht/meson.build
@@ -29,16 +29,6 @@ libgnunetdht_dep = declare_dependency(link_with : libgnunetdht)
 pkg.generate(libgnunetdht, url: 'https://www.gnunet.org',
            description : 'Provides API for the R5N distributed hash table')
 
-shared_module('gnunet_plugin_block_dht',
-        ['plugin_block_dht.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunethello_dep,
-                       libgnunetblock_dep,
-                       libgnunetblockgroup_dep],
-        include_directories: [incdir, configuration_inc],
-              install:true,
-              install_dir: get_option('libdir')/'gnunet')
-
 executable ('gnunet-service-dht',
             gnunetservicedht_src,
             dependencies: [libgnunetdht_dep, libgnunetutil_dep,
diff --git a/src/plugin/dhtu/.gitignore b/src/service/dhtu/.gitignore
index 21f1a7c9b..21f1a7c9b 100644
--- a/src/plugin/dhtu/.gitignore
+++ b/src/service/dhtu/.gitignore
diff --git a/src/plugin/dhtu/Makefile.am b/src/service/dhtu/Makefile.am
index 500d5a7b1..500d5a7b1 100644
--- a/src/plugin/dhtu/Makefile.am
+++ b/src/service/dhtu/Makefile.am
diff --git a/src/plugin/dhtu/dhtu.conf b/src/service/dhtu/dhtu.conf
index ea5ade752..ea5ade752 100644
--- a/src/plugin/dhtu/dhtu.conf
+++ b/src/service/dhtu/dhtu.conf
diff --git a/src/plugin/dhtu/meson.build b/src/service/dhtu/meson.build
index b2525e782..b2525e782 100644
--- a/src/plugin/dhtu/meson.build
+++ b/src/service/dhtu/meson.build
diff --git a/src/plugin/dhtu/plugin_dhtu_gnunet.c b/src/service/dhtu/plugin_dhtu_gnunet.c
index 75f466916..75f466916 100644
--- a/src/plugin/dhtu/plugin_dhtu_gnunet.c
+++ b/src/service/dhtu/plugin_dhtu_gnunet.c
diff --git a/src/plugin/dhtu/plugin_dhtu_ip.c b/src/service/dhtu/plugin_dhtu_ip.c
index 06d0f0f60..06d0f0f60 100644
--- a/src/plugin/dhtu/plugin_dhtu_ip.c
+++ b/src/service/dhtu/plugin_dhtu_ip.c
diff --git a/src/plugin/dhtu/test_dhtu_ip.c b/src/service/dhtu/test_dhtu_ip.c
index 030b17b5f..030b17b5f 100644
--- a/src/plugin/dhtu/test_dhtu_ip.c
+++ b/src/service/dhtu/test_dhtu_ip.c
diff --git a/src/plugin/dhtu/testing_dhtu_cmd_send.c b/src/service/dhtu/testing_dhtu_cmd_send.c
index 45d166b14..45d166b14 100644
--- a/src/plugin/dhtu/testing_dhtu_cmd_send.c
+++ b/src/service/dhtu/testing_dhtu_cmd_send.c
diff --git a/src/service/dns/Makefile.am b/src/service/dns/Makefile.am
index 38ee78c3a..0d07b9e5e 100644
--- a/src/service/dns/Makefile.am
+++ b/src/service/dns/Makefile.am
@@ -29,9 +29,6 @@ noinst_PROGRAMS = \
   gnunet-dns-redirector \
   gnunet-zonewalk
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dns.la
-
 if LINUX
 check_SCRIPTS = \
  test_gnunet_dns.sh
@@ -77,17 +74,6 @@ libgnunetdns_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
 
-libgnunet_plugin_block_dns_la_SOURCES = \
-  plugin_block_dns.c
-libgnunet_plugin_block_dns_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunet_plugin_block_dns_la_LDFLAGS = \
-  $(GN_LIBINTL) \
-  $(top_builddir)/src/block/$(GN_PLUGIN_LDFLAGS)
-
-
 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_PROGRAMS)  $(check_SCRIPTS)
diff --git a/src/service/dns/meson.build b/src/service/dns/meson.build
index fe0f6e954..e1b7f7670 100644
--- a/src/service/dns/meson.build
+++ b/src/service/dns/meson.build
@@ -1,5 +1,4 @@
 libgnunetdns_src = ['dns_api.c']
-libgnunetpluginblockdns_src = ['plugin_block_dns.c']
 
 gnunetservicedns_src = ['gnunet-service-dns.c']
 gnunetdnsredirector_src = ['gnunet-dns-monitor.c']
@@ -12,7 +11,7 @@ configure_file(input : 'dns.conf.in',
                install_dir: pkgcfgdir)
 
 if get_option('monolith')
-  foreach p : libgnunetdns_src + gnunetservicedns_src + libgnunetpluginblockdns_src
+  foreach p : libgnunetdns_src + gnunetservicedns_src
     gnunet_src += 'dns/' + p
   endforeach
 endif
@@ -29,13 +28,6 @@ libgnunetdns_dep = declare_dependency(link_with : libgnunetdns)
 pkg.generate(libgnunetdns, url: 'https://www.gnunet.org',
              description : 'Provides API to access GNUnet\'s DNS service (to intercept and manipulate DNS queries)')
 
-shared_module('gnunet_plugin_block_dns',
-        libgnunetpluginblockdns_src,
-        dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir')/'gnunet')
-
 executable ('gnunet-service-dns',
             gnunetservicedns_src,
             dependencies: [libgnunetdns_dep, libgnunetutil_dep,
diff --git a/src/service/meson.build b/src/service/meson.build
index 6acbc3b10..b089c9794 100644
--- a/src/service/meson.build
+++ b/src/service/meson.build
@@ -2,7 +2,6 @@ subdir('util')
 subdir('arm')
 subdir('statistics')
 subdir('testing')
-subdir('rest')
 subdir('datacache')
 subdir('datastore')
 subdir('peerstore')
@@ -11,6 +10,7 @@ subdir('nat-auto')
 subdir('transport')
 subdir('core')
 subdir('nse')
+subdir('dhtu')
 subdir('dht')
 subdir('hostlist')
 subdir('regex')
@@ -30,6 +30,7 @@ subdir('exit')
 subdir('pt')
 subdir('reclaim')
 subdir('messenger')
+subdir('rest')
 
 if not get_option('monolith')
   subdir_done()
@@ -42,7 +43,10 @@ libgnunet = library('gnunet',
                                    libgnunetjson_dep,
                                    libgnunetblock_dep,
                                    libgnunetblockgroup_dep,
+                                   libgnunetregexblock_dep,
                                    libgnunetgnsrecord_dep,
+                                   libgnunetgnsrecordjson_dep,
+                                   jose_dep,
                                    libgnunetcurl_dep],
                     c_args: ['-DHAVE_GNUNET_MONOLITH=1'],
                     include_directories: [incdir, configuration_inc, exitdir])
diff --git a/src/service/messenger/Makefile.am b/src/service/messenger/Makefile.am
index d778d6e0c..c2ae65a08 100644
--- a/src/service/messenger/Makefile.am
+++ b/src/service/messenger/Makefile.am
@@ -10,19 +10,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_messenger.la
-
-
-libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
-  plugin_gnsrecord_messenger.c
-libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 pkgcfg_DATA = \
   messenger.conf
 
diff --git a/src/service/messenger/meson.build b/src/service/messenger/meson.build
index a6de2f516..3c05d7760 100644
--- a/src/service/messenger/meson.build
+++ b/src/service/messenger/meson.build
@@ -55,14 +55,6 @@ libgnunetmessenger_dep = declare_dependency(link_with : libgnunetmessenger)
 pkg.generate(libgnunetmessenger, url: 'https://www.gnunet.org',
              description : 'Provides API to access the GNUnet Messenger subsystem')
 
-shared_module('gnunet_plugin_gnsrecord_messenger',
-              ['plugin_gnsrecord_messenger.c'],
-              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep,
-                             libgnunetmessenger_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir')/'gnunet')
-
 executable ('gnunet-service-messenger',
             gnunetservicemessenger_src,
             dependencies: [libgnunetmessenger_dep,
diff --git a/src/service/namestore/meson.build b/src/service/namestore/meson.build
index 879eaef09..912b312fa 100644
--- a/src/service/namestore/meson.build
+++ b/src/service/namestore/meson.build
@@ -1,7 +1,5 @@
 libgnunetnamestore_src = ['namestore_api.c', 'namestore_api_monitor.c']
-libgnunetpluginnamestore_sqlite_src = ['plugin_namestore_sqlite.c']
 
-gnunetnamestore_src = ['gnunet-namestore.c']
 gnunetservicenamestore_src = ['gnunet-service-namestore.c']
 
 configure_file(input : 'namestore.conf.in',
diff --git a/src/service/peerstore/Makefile.am b/src/service/peerstore/Makefile.am
index 28948b7db..de301bbcf 100644
--- a/src/service/peerstore/Makefile.am
+++ b/src/service/peerstore/Makefile.am
@@ -51,63 +51,15 @@ libgnunetpeerstore_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_LIB_LDFLAGS)
 
-if HAVE_EXPERIMENTAL
-FLAT_PLUGIN = libgnunet_plugin_peerstore_flat.la
-FLAT_TESTS = test_plugin_peerstore_flat
-libgnunet_plugin_peerstore_flat_la_SOURCES = \
-  plugin_peerstore_flat.c
-libgnunet_plugin_peerstore_flat_la_LIBADD = \
-  libgnunetpeerstore.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
-  $(LTLIBINTL)
-libgnunet_plugin_peerstore_flat_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-if HAVE_SQLITE
-SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la
-SQLITE_TESTS = test_plugin_peerstore_sqlite
-libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
-  plugin_peerstore_sqlite.c
-libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
-  libgnunetpeerstore.la  \
-  $(top_builddir)/src/lib/sq/libgnunetsq.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIBS) -lsqlite3 \
-  $(LTLIBINTL)
-libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-endif
-
-plugin_LTLIBRARIES = \
-  $(SQLITE_PLUGIN) \
-        $(FLAT_PLUGIN)
-
-test_plugin_peerstore_sqlite_SOURCES = \
-  test_plugin_peerstore.c
-test_plugin_peerstore_sqlite_LDADD = \
-        $(top_builddir)/src/service/testing/libgnunettesting.la \
-        $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_plugin_peerstore_flat_SOURCES = \
-  test_plugin_peerstore.c
-test_plugin_peerstore_flat_LDADD = \
-        $(top_builddir)/src/service/testing/libgnunettesting.la \
-        $(top_builddir)/src/lib/util/libgnunetutil.la
-
 check_PROGRAMS = \
  test_peerstore_api_store \
  test_peerstore_api_iterate \
  test_peerstore_api_watch \
  test_peerstore_api_sync \
- perf_peerstore_store \
- $(SQLITE_TESTS) \
- $(FLAT_TESTS)
+ perf_peerstore_store
 
 EXTRA_DIST = \
- test_peerstore_api_data.conf \
- test_plugin_peerstore_flat.conf \
- test_plugin_peerstore_sqlite.conf
+ test_peerstore_api_data.conf
 
 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;
diff --git a/src/service/peerstore/meson.build b/src/service/peerstore/meson.build
index 7d8710c4b..db70b0b9e 100644
--- a/src/service/peerstore/meson.build
+++ b/src/service/peerstore/meson.build
@@ -28,16 +28,6 @@ pkg.generate(libgnunetpeerstore, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the peerstore service')
 libgnunetpeerstore_dep = declare_dependency(link_with : libgnunetpeerstore)
 
-shared_module('gnunet_plugin_peerstore_sqlite',
-        ['plugin_peerstore_sqlite.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetpeerstore_dep,
-                       libgnunetsq_dep,
-                       sqlite_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir')/'gnunet')
-
 executable ('gnunet-service-peerstore',
             gnunetservicepeerstore_src,
             dependencies: [libgnunetpeerstore_dep,
diff --git a/src/service/regex/Makefile.am b/src/service/regex/Makefile.am
index 14cdb054b..255988889 100644
--- a/src/service/regex/Makefile.am
+++ b/src/service/regex/Makefile.am
@@ -31,27 +31,15 @@ REGEX_INTERNAL_TEST = \
 gnunet_service_regex_SOURCES =  \
  $(REGEX_INTERNAL) gnunet-service-regex.c
 gnunet_service_regex_LDADD =  -lm \
- libgnunetregexblock.la \
+ $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
  $(top_builddir)/src/service/dht/libgnunetdht.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(GN_LIBINTL)
 
 lib_LTLIBRARIES = \
-  libgnunetregexblock.la \
   libgnunetregex.la
 
-libgnunetregexblock_la_SOURCES = \
-  regex_block_lib.c regex_block_lib.h
-libgnunetregexblock_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(XLIB) \
-  $(LTLIBINTL)
-libgnunetregexblock_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 1:0:0
-
-
 libgnunetregex_la_SOURCES = \
   regex_api_announce.c \
   regex_api_search.c \
@@ -64,20 +52,6 @@ libgnunetregex_la_LDFLAGS = \
    -version-info 3:1:0
 
 
-plugin_LTLIBRARIES = \
- libgnunet_plugin_block_regex.la
-
-libgnunet_plugin_block_regex_la_SOURCES = \
- plugin_block_regex.c
-libgnunet_plugin_block_regex_la_LIBADD = \
- libgnunetregexblock.la \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunet_plugin_block_regex_la_LDFLAGS = \
- $(GN_LIBINTL) \
- $(GN_PLUGIN_LDFLAGS)
-
 # FIXME we phased out mysql. If we want to keep, needs rewrite
 #if HAVE_MYSQL
 #noinst_mysql_progs = \
@@ -100,7 +74,7 @@ perf_regex_SOURCES = \
   $(REGEX_INTERNAL_TEST) perf-regex.c
 perf_regex_LDADD = -lm \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  libgnunetregexblock.la \
+  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 perf_regex_LDFLAGS = \
@@ -110,7 +84,7 @@ gnunet_daemon_regexprofiler_SOURCES = \
   $(REGEX_INTERNAL_TEST) gnunet-daemon-regexprofiler.c
 gnunet_daemon_regexprofiler_LDADD = -lm \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  libgnunetregexblock.la \
+  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 gnunet_daemon_regexprofiler_LDFLAGS = \
@@ -133,7 +107,7 @@ test_regex_eval_api_SOURCES = \
   $(REGEX_INTERNAL_TEST) test_regex_eval_api.c
 test_regex_eval_api_LDADD = -lm \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  libgnunetregexblock.la \
+  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -154,7 +128,7 @@ test_regex_api_LDADD = -lm \
 test_regex_iterate_api_SOURCES = \
   $(REGEX_INTERNAL) test_regex_iterate_api.c
 test_regex_iterate_api_LDADD = -lm \
-  libgnunetregexblock.la \
+  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -163,7 +137,7 @@ test_regex_proofs_SOURCES = \
   $(REGEX_INTERNAL_TEST) test_regex_proofs.c
 test_regex_proofs_LDADD = -lm \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  libgnunetregexblock.la \
+  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -171,7 +145,7 @@ test_regex_graph_api_SOURCES = \
   $(REGEX_INTERNAL_TEST) test_regex_graph_api.c
 test_regex_graph_api_LDADD = -lm \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  libgnunetregexblock.la \
+  $(top_builddir)/src/plugin/regex/libgnunetregexblock.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/service/regex/meson.build b/src/service/regex/meson.build
index da607ca47..3c25a5148 100644
--- a/src/service/regex/meson.build
+++ b/src/service/regex/meson.build
@@ -1,7 +1,5 @@
 libgnunetregex_src = ['regex_api_announce.c',
                      'regex_api_search.c']
-libgnunetregexblock_src = ['regex_block_lib.c']
-
 gnunetserviceregex_src = ['gnunet-service-regex.c',
                           'regex_internal_dht.c',
                           'regex_internal.c']
@@ -14,7 +12,7 @@ configure_file(input : 'regex.conf.in',
 
 
 if get_option('monolith')
-  foreach p : libgnunetregex_src + libgnunetregexblock_src + gnunetserviceregex_src
+  foreach p : libgnunetregex_src + gnunetserviceregex_src
     gnunet_src += 'regex/' + p
   endforeach
 endif
@@ -30,26 +28,6 @@ libgnunetregex = library('gnunetregex',
 pkg.generate(libgnunetregex, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the regex service')
 libgnunetregex_dep = declare_dependency(link_with : libgnunetregex)
-libgnunetregexblock = library('gnunetregexblock',
-        libgnunetregexblock_src,
-        soversion: '1',
-        version: '1.0.0',
-        dependencies: libgnunetutil_dep,
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir'))
-libgnunetregexblock_dep = declare_dependency(link_with : libgnunetregexblock)
-
-shared_module('gnunet_plugin_block_regex',
-        ['plugin_block_regex.c'],
-        dependencies: [libgnunetutil_dep,
-                       libgnunetregexblock_dep,
-                       libgnunetblock_dep,
-                       libgnunetblockgroup_dep],
-        include_directories: [incdir, configuration_inc],
-              install:true,
-              install_dir: get_option('libdir')/'gnunet')
-
 
 executable ('gnunet-service-regex',
             gnunetserviceregex_src,
diff --git a/src/service/regex/regex_internal_dht.c b/src/service/regex/regex_internal_dht.c
index bda979edb..9850f106f 100644
--- a/src/service/regex/regex_internal_dht.c
+++ b/src/service/regex/regex_internal_dht.c
@@ -25,7 +25,6 @@
  */
 #include "platform.h"
 #include "regex_internal_lib.h"
-#include "regex_block_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_constants.h"
diff --git a/src/service/regex/regex_internal_lib.h b/src/service/regex/regex_internal_lib.h
index 9baf84995..bfa3fc97d 100644
--- a/src/service/regex/regex_internal_lib.h
+++ b/src/service/regex/regex_internal_lib.h
@@ -29,7 +29,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
-#include "regex_block_lib.h"
+#include "../../plugin/regex/regex_block_lib.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/service/rest/Makefile.am b/src/service/rest/Makefile.am
index 401be36f4..60769e366 100644
--- a/src/service/rest/Makefile.am
+++ b/src/service/rest/Makefile.am
@@ -24,10 +24,35 @@ libexec_PROGRAMS = \
 EXTRA_DIST = \
  rest.conf
 
+if HAVE_JOSE
+OPENID_PLUGIN = \
+ openid_plugin.c \
+ oidc_helper.c
+OPENID_JOSE_LIBS = -ljose
+endif
+
 gnunet_rest_server_SOURCES = \
- gnunet-rest-server.c
+ gnunet-rest-server.c \
+ config_plugin.c \
+ copying_plugin.c \
+ identity_plugin.c \
+ namestore_plugin.c \
+ gns_plugin.c \
+ $(OPENID_PLUGIN) \
+ reclaim_plugin.c json_reclaim.c
 gnunet_rest_server_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecordjson.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/gns/libgnunetgns.la \
+  $(top_builddir)/src/service/reclaim/libgnunetreclaim.la \
+  libgnunetrest.la \
+        $(OPENID_JOSE_LIBS) \
+        -ljansson \
+        $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL) $(MHD_LIBS)
 gnunet_rest_server_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 
diff --git a/src/rest-plugin/rest/plugin_rest_config.c b/src/service/rest/config_plugin.c
index 826188702..fd0ac011a 100644
--- a/src/rest-plugin/rest/plugin_rest_config.c
+++ b/src/service/rest/config_plugin.c
@@ -40,7 +40,7 @@ struct Plugin
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 };
 
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+const struct GNUNET_CONFIGURATION_Handle *config_cfg;
 
 struct RequestHandle
 {
@@ -78,6 +78,7 @@ struct RequestHandle
    * The URL
    */
   char *url;
+
 };
 
 /**
@@ -184,13 +185,13 @@ get_cont (struct GNUNET_REST_RequestHandle *con_handle,
   if (strlen (GNUNET_REST_API_NS_CONFIG) == strlen (handle->url))
   {
     result = json_object ();
-    GNUNET_CONFIGURATION_iterate (cfg, &add_sections, result);
+    GNUNET_CONFIGURATION_iterate (config_cfg, &add_sections, result);
   }
   else
   {
     result = json_object ();
     section = &handle->url[strlen (GNUNET_REST_API_NS_CONFIG) + 1];
-    GNUNET_CONFIGURATION_iterate_section_values (cfg,
+    GNUNET_CONFIGURATION_iterate_section_values (config_cfg,
                                                  section,
                                                  &add_section_contents,
                                                  result);
@@ -243,7 +244,7 @@ set_cont (struct GNUNET_REST_RequestHandle *con_handle,
 {
   struct RequestHandle *handle = cls;
   char term_data[handle->rest_handle->data_size + 1];
-  struct GNUNET_CONFIGURATION_Handle *out = GNUNET_CONFIGURATION_dup (cfg);
+  struct GNUNET_CONFIGURATION_Handle *out = GNUNET_CONFIGURATION_dup (config_cfg);
 
   json_error_t err;
   json_t *data_json;
@@ -330,7 +331,7 @@ set_cont (struct GNUNET_REST_RequestHandle *con_handle,
     cfg_fn = GNUNET_strdup (GNUNET_OS_project_data_get ()->user_config_file);
 
   GNUNET_CONFIGURATION_write (out, cfg_fn);
-  cfg = out;
+  config_cfg = out;
   handle->proc (handle->proc_cls,
                 GNUNET_REST_create_response (NULL),
                 MHD_HTTP_OK);
@@ -361,19 +362,9 @@ options_cont (struct GNUNET_REST_RequestHandle *con_handle,
 }
 
 
-/**
- * Function processing the REST call
- *
- * @param method HTTP method
- * @param url URL of the HTTP request
- * @param data body of the HTTP request (optional)
- * @param data_size length of the body
- * @param proc callback function for the result
- * @param proc_cls closure for @a proc
- * @return #GNUNET_OK if request accepted
- */
-static enum GNUNET_GenericReturnValue
-rest_config_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
+enum GNUNET_GenericReturnValue
+REST_config_process_request (void *plugin,
+                             struct GNUNET_REST_RequestHandle *conndata_handle,
                              GNUNET_REST_ResultProcessor proc,
                              void *proc_cls)
 {
@@ -383,6 +374,7 @@ rest_config_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
     { MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_CONFIG, &options_cont },
     GNUNET_REST_HANDLER_END
   };
+  (void) plugin;
   struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
   struct GNUNET_REST_RequestHandlerError err;
 
@@ -404,6 +396,19 @@ rest_config_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
   return GNUNET_YES;
 }
 
+void
+REST_config_done (struct GNUNET_REST_Plugin *api)
+{
+  struct Plugin *plugin;
+
+  while (NULL != requests_head)
+    cleanup_handle (requests_head);
+  plugin = api->cls;
+  plugin->cfg = NULL;
+  GNUNET_free (api);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CONFIG REST plugin is finished\n");
+}
+
 
 /**
  * Entry point for the plugin.
@@ -412,44 +417,22 @@ rest_config_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
  * @return NULL on error, otherwise the plugin context
  */
 void *
-libgnunet_plugin_rest_config_init (void *cls)
+REST_config_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static struct Plugin plugin;
 
-  cfg = cls;
+  config_cfg = c;
   struct GNUNET_REST_Plugin *api;
 
   memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
+  plugin.cfg = c;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_CONFIG;
-  api->process_request = &rest_config_process_request;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("CONFIG REST API initialized\n"));
   return api;
 }
 
 
-/**
- * Exit point from the plugin.
- *
- * @param cls the plugin context (as returned by "init")
- * @return always NULL
- */
-void *
-libgnunet_plugin_rest_config_done (void *cls)
-{
-  struct GNUNET_REST_Plugin *api = cls;
-  struct Plugin *plugin;
-
-  while (NULL != requests_head)
-    cleanup_handle (requests_head);
-  plugin = api->cls;
-  plugin->cfg = NULL;
-  GNUNET_free (api);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CONFIG REST plugin is finished\n");
-  return NULL;
-}
-
 
 /* end of plugin_rest_config.c */
diff --git a/src/service/rest/config_plugin.h b/src/service/rest/config_plugin.h
new file mode 100644
index 000000000..c959a94f2
--- /dev/null
+++ b/src/service/rest/config_plugin.h
@@ -0,0 +1,37 @@
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_rest_plugin.h"
+
+/**
+ * Function processing the REST call
+ *
+ * @param method HTTP method
+ * @param url URL of the HTTP request
+ * @param data body of the HTTP request (optional)
+ * @param data_size length of the body
+ * @param proc callback function for the result
+ * @param proc_cls closure for @a proc
+ * @return #GNUNET_OK if request accepted
+ */
+enum GNUNET_GenericReturnValue
+REST_config_process_request (void *plugin,
+                             struct GNUNET_REST_RequestHandle *conndata_handle,
+                             GNUNET_REST_ResultProcessor proc,
+                             void *proc_cls);
+
+/**
+ * Entry point for the plugin.
+ *
+ */
+void *
+REST_config_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls the plugin context (as returned by "init")
+ * @return always NULL
+ */
+void
+REST_config_done (struct GNUNET_REST_Plugin *api);
+
diff --git a/src/rest-plugin/rest/plugin_rest_copying.c b/src/service/rest/copying_plugin.c
index 52783a81a..d907f6729 100644
--- a/src/rest-plugin/rest/plugin_rest_copying.c
+++ b/src/service/rest/copying_plugin.c
@@ -31,7 +31,7 @@
 #define GNUNET_REST_API_NS_COPYING "/copying"
 
 #define GNUNET_REST_COPYING_TEXT \
-  "GNU Affero General Public License version 3 or later. See also: <http://www.gnu.org/licenses/>"
+        "GNU Affero General Public License version 3 or later. See also: <http://www.gnu.org/licenses/>"
 
 /**
  * @brief struct returned by the initialization function of the plugin
@@ -41,8 +41,6 @@ struct Plugin
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 };
 
-const struct GNUNET_CONFIGURATION_Handle *cfg;
-
 struct RequestHandle
 {
   /**
@@ -159,8 +157,9 @@ options_cont (struct GNUNET_REST_RequestHandle *con_handle,
  * @param proc_cls closure for @a proc
  * @return #GNUNET_OK if request accepted
  */
-static enum GNUNET_GenericReturnValue
-rest_copying_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
+enum GNUNET_GenericReturnValue
+REST_copying_process_request (void *plugin,
+                              struct GNUNET_REST_RequestHandle *conndata_handle,
                               GNUNET_REST_ResultProcessor proc,
                               void *proc_cls)
 {
@@ -191,22 +190,20 @@ rest_copying_process_request (struct GNUNET_REST_RequestHandle *conndata_handle,
  * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*"
  * @return NULL on error, otherwise the plugin context
  */
-void *
-libgnunet_plugin_rest_copying_init (void *cls)
+void*
+REST_copying_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static struct Plugin plugin;
 
-  cfg = cls;
   struct GNUNET_REST_Plugin *api;
 
   if (NULL != plugin.cfg)
     return NULL;                /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
+  plugin.cfg = c;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_COPYING;
-  api->process_request = &rest_copying_process_request;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _ ("COPYING REST API initialized\n"));
   return api;
@@ -219,10 +216,9 @@ libgnunet_plugin_rest_copying_init (void *cls)
  * @param cls the plugin context (as returned by "init")
  * @return always NULL
  */
-void *
-libgnunet_plugin_rest_copying_done (void *cls)
+void
+REST_copying_done (struct GNUNET_REST_Plugin *api)
 {
-  struct GNUNET_REST_Plugin *api = cls;
   struct Plugin *plugin = api->cls;
 
   while (NULL != requests_head)
@@ -231,7 +227,6 @@ libgnunet_plugin_rest_copying_done (void *cls)
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "COPYING REST plugin is finished\n");
-  return NULL;
 }
 
 
diff --git a/src/service/rest/copying_plugin.h b/src/service/rest/copying_plugin.h
new file mode 100644
index 000000000..4ba1a2e36
--- /dev/null
+++ b/src/service/rest/copying_plugin.h
@@ -0,0 +1,36 @@
+#include "gnunet_rest_plugin.h"
+/**
+ * Function processing the REST call
+ *
+ * @param method HTTP method
+ * @param url URL of the HTTP request
+ * @param data body of the HTTP request (optional)
+ * @param data_size length of the body
+ * @param proc callback function for the result
+ * @param proc_cls closure for @a proc
+ * @return #GNUNET_OK if request accepted
+ */
+enum GNUNET_GenericReturnValue
+REST_copying_process_request (void *plugin,
+                              struct GNUNET_REST_RequestHandle *conndata_handle,
+                              GNUNET_REST_ResultProcessor proc,
+                              void *proc_cls);
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*"
+ * @return NULL on error, otherwise the plugin context
+ */
+void*
+REST_copying_init (const struct GNUNET_CONFIGURATION_Handle *c);
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls the plugin context (as returned by "init")
+ * @return always NULL
+ */
+void
+REST_copying_done (struct GNUNET_REST_Plugin *api);
diff --git a/src/rest-plugin/gns/plugin_rest_gns.c b/src/service/rest/gns_plugin.c
index 659b77493..0ea89d0cd 100644
--- a/src/rest-plugin/gns/plugin_rest_gns.c
+++ b/src/service/rest/gns_plugin.c
@@ -56,7 +56,7 @@
 /**
  * The configuration handle
  */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+const struct GNUNET_CONFIGURATION_Handle *gns_cfg;
 
 /**
  * HTTP methods allows for this plugin
@@ -221,7 +221,7 @@ do_error (void *cls)
   handle->proc (handle->proc_cls, resp, handle->response_code);
   json_decref (json_error);
   GNUNET_free (response);
-  cleanup_handle(handle);
+  cleanup_handle (handle);
 }
 
 
@@ -265,7 +265,8 @@ handle_gns_response (void *cls,
     return;
   }
 
-  result_obj = GNUNET_GNSRECORD_JSON_from_gnsrecord (handle->name, rd, rd_count);
+  result_obj = GNUNET_GNSRECORD_JSON_from_gnsrecord (handle->name, rd,
+                                                     rd_count);
 
   result = json_dumps (result_obj, 0);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Result %s\n", result);
@@ -381,10 +382,11 @@ options_cont (struct GNUNET_REST_RequestHandle *con_handle,
  * @param proc_cls closure for callback function
  * @return GNUNET_OK if request accepted
  */
-static enum GNUNET_GenericReturnValue
-rest_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                      GNUNET_REST_ResultProcessor proc,
-                      void *proc_cls)
+enum GNUNET_GenericReturnValue
+REST_gns_process_request (void *plugin,
+                          struct GNUNET_REST_RequestHandle *rest_handle,
+                          GNUNET_REST_ResultProcessor proc,
+                          void *proc_cls)
 {
   struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
   struct GNUNET_REST_RequestHandlerError err;
@@ -426,18 +428,17 @@ rest_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
  * @return NULL on error, otherwise the plugin context
  */
 void *
-libgnunet_plugin_rest_gns_init (void *cls)
+REST_gns_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static struct Plugin plugin;
   struct GNUNET_REST_Plugin *api;
 
-  cfg = cls;
+  gns_cfg = c;
   memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
+  plugin.cfg = gns_cfg;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_GNS;
-  api->process_request = &rest_process_request;
   GNUNET_asprintf (&allow_methods,
                    "%s, %s, %s, %s, %s",
                    MHD_HTTP_METHOD_GET,
@@ -445,7 +446,7 @@ libgnunet_plugin_rest_gns_init (void *cls)
                    MHD_HTTP_METHOD_PUT,
                    MHD_HTTP_METHOD_DELETE,
                    MHD_HTTP_METHOD_OPTIONS);
-  gns = GNUNET_GNS_connect (cfg);
+  gns = GNUNET_GNS_connect (gns_cfg);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _ ("Gns REST API initialized\n"));
   return api;
@@ -459,7 +460,7 @@ libgnunet_plugin_rest_gns_init (void *cls)
  * @return always NULL
  */
 void *
-libgnunet_plugin_rest_gns_done (void *cls)
+REST_gns_done (void *cls)
 {
   struct GNUNET_REST_Plugin *api = cls;
   struct RequestHandle *request;
diff --git a/src/service/rest/gns_plugin.h b/src/service/rest/gns_plugin.h
new file mode 100644
index 000000000..13878c139
--- /dev/null
+++ b/src/service/rest/gns_plugin.h
@@ -0,0 +1,36 @@
+#include "gnunet_rest_plugin.h"
+/**
+ * Function processing the REST call
+ *
+ * @param method HTTP method
+ * @param url URL of the HTTP request
+ * @param data body of the HTTP request (optional)
+ * @param data_size length of the body
+ * @param proc callback function for the result
+ * @param proc_cls closure for @a proc
+ * @return #GNUNET_OK if request accepted
+ */
+enum GNUNET_GenericReturnValue
+REST_gns_process_request (void *plugin,
+                          struct GNUNET_REST_RequestHandle *conndata_handle,
+                          GNUNET_REST_ResultProcessor proc,
+                          void *proc_cls);
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*"
+ * @return NULL on error, otherwise the plugin context
+ */
+void*
+REST_gns_init (const struct GNUNET_CONFIGURATION_Handle *c);
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls the plugin context (as returned by "init")
+ * @return always NULL
+ */
+void
+REST_gns_done (struct GNUNET_REST_Plugin *api);
diff --git a/src/service/rest/gnunet-rest-server.c b/src/service/rest/gnunet-rest-server.c
index 5163c2271..ce81704ae 100644
--- a/src/service/rest/gnunet-rest-server.c
+++ b/src/service/rest/gnunet-rest-server.c
@@ -29,6 +29,16 @@
 #include "gnunet_rest_plugin.h"
 #include "gnunet_mhd_compat.h"
 
+#include "config_plugin.h"
+#include "copying_plugin.h"
+#include "identity_plugin.h"
+#include "namestore_plugin.h"
+#include "gns_plugin.h"
+#ifdef HAVE_JOSE
+#include "openid_plugin.h"
+#endif
+#include "reclaim_plugin.h"
+
 /**
  * Default Socks5 listen port.
  */
@@ -54,7 +64,7 @@
  * After how long do we clean up unused MHD SSL/TLS instances?
  */
 #define MHD_CACHE_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
 
 #define GN_REST_STATE_INIT 0
 #define GN_REST_STATE_PROCESSING 1
@@ -178,7 +188,12 @@ struct PluginListEntry
   /**
    * The plugin
    */
-  struct GNUNET_REST_Plugin *plugin;
+  void *plugin;
+
+  /**
+   * Request function
+   */
+  GNUNET_REST_ProcessingFunction process_request;
 };
 
 /**
@@ -240,6 +255,21 @@ static struct AcceptedRequest *req_list_head;
  */
 static struct AcceptedRequest *req_list_tail;
 
+
+/**
+ * plugins
+ */
+
+struct GNUNET_REST_Plugin *config_plugin;
+struct GNUNET_REST_Plugin *copying_plugin;
+struct GNUNET_REST_Plugin *identity_plugin;
+struct GNUNET_REST_Plugin *namestore_plugin;
+struct GNUNET_REST_Plugin *gns_plugin;
+#ifdef HAVE_JOSE
+struct GNUNET_REST_Plugin *openid_plugin;
+#endif
+struct GNUNET_REST_Plugin *reclaim_plugin;
+
 /* ************************* Global helpers ********************* */
 
 
@@ -294,6 +324,7 @@ cleanup_url_map (void *cls, const struct GNUNET_HashCode *key, void *value)
   return GNUNET_YES;
 }
 
+
 static void
 cleanup_handle (struct MhdConnectionHandle *handle)
 {
@@ -323,6 +354,7 @@ cleanup_handle (struct MhdConnectionHandle *handle)
   GNUNET_free (handle);
 }
 
+
 static void
 cleanup_ar (struct AcceptedRequest *ar)
 {
@@ -334,7 +366,8 @@ cleanup_ar (struct AcceptedRequest *ar)
   {
     GNUNET_NETWORK_socket_free_memory_only_ (ar->sock);
   }
-  else {
+  else
+  {
     GNUNET_NETWORK_socket_close (ar->sock);
   }
   ar->sock = NULL;
@@ -344,6 +377,7 @@ cleanup_ar (struct AcceptedRequest *ar)
   GNUNET_free (ar);
 }
 
+
 static int
 header_iterator (void *cls,
                  enum MHD_ValueKind kind,
@@ -561,9 +595,10 @@ create_response (void *cls,
     con_handle->state = GN_REST_STATE_PROCESSING;
     for (ple = plugins_head; NULL != ple; ple = ple->next)
     {
-      if (GNUNET_YES == ple->plugin->process_request (rest_conndata_handle,
-                                                      &plugin_callback,
-                                                      con_handle))
+      if (GNUNET_YES == ple->process_request (ple->plugin,
+                                              rest_conndata_handle,
+                                              &plugin_callback,
+                                              con_handle))
         break; /* Request handled */
     }
     if (NULL == ple)
@@ -603,8 +638,8 @@ create_response (void *cls,
                          strlen ("chrome-extension://"))))
       {
         GNUNET_assert (MHD_NO != MHD_add_response_header (con_handle->response,
-                                 MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-                                 origin));
+                                                          MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
+                                                          origin));
       }
     }
     if (NULL != allow_origins)
@@ -615,9 +650,10 @@ create_response (void *cls,
       {
         if (0 == strncmp (allow_origin, origin, strlen (allow_origin)))
         {
-          GNUNET_assert (MHD_NO != MHD_add_response_header (con_handle->response,
-                                   MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-                                   allow_origin));
+          GNUNET_assert (MHD_NO != MHD_add_response_header (
+                           con_handle->response,
+                           MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
+                           allow_origin));
           break;
         }
         allow_origin = strtok (NULL, ",");
@@ -628,14 +664,14 @@ create_response (void *cls,
   if (NULL != allow_credentials)
   {
     GNUNET_assert (MHD_NO != MHD_add_response_header (con_handle->response,
-                             "Access-Control-Allow-Credentials",
-                             allow_credentials));
+                                                      "Access-Control-Allow-Credentials",
+                                                      allow_credentials));
   }
   if (NULL != allow_headers)
   {
     GNUNET_assert (MHD_NO != MHD_add_response_header (con_handle->response,
-                             "Access-Control-Allow-Headers",
-                             allow_headers));
+                                                      "Access-Control-Allow-Headers",
+                                                      allow_headers));
   }
   run_mhd_now ();
   {
@@ -757,6 +793,7 @@ schedule_httpd ()
     GNUNET_NETWORK_fdset_destroy (wws);
 }
 
+
 /**
  * Function called when MHD first processes an incoming connection.
  * Gives us the respective URI information.
@@ -791,7 +828,6 @@ mhd_log_callback (void *cls,
 }
 
 
-
 /**
  * Function called when MHD decides that we are done with a connection.
  *
@@ -823,6 +859,7 @@ mhd_completed_cb (void *cls,
   *con_cls = NULL;
 }
 
+
 /**
  * Function called when MHD connection is opened or closed.
  *
@@ -886,7 +923,6 @@ mhd_connection_cb (void *cls,
 }
 
 
-
 /**
  * Task run whenever HTTP server operations are pending.
  *
@@ -977,10 +1013,17 @@ do_shutdown (void *cls)
     GNUNET_CONTAINER_DLL_remove (plugins_head,
                                  plugins_tail,
                                  ple);
-    GNUNET_PLUGIN_unload (ple->libname, ple->plugin);
     GNUNET_free (ple->libname);
     GNUNET_free (ple);
   }
+  REST_config_done (config_plugin);
+  REST_copying_done (copying_plugin);
+  REST_identity_done (identity_plugin);
+  REST_gns_done (gns_plugin);
+#ifdef HAVE_JOSE
+  REST_openid_done (openid_plugin);
+#endif
+  REST_reclaim_done (reclaim_plugin);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down...\n");
   kill_httpd ();
   GNUNET_free (allow_credentials);
@@ -1065,28 +1108,30 @@ bind_v6 ()
  * @param libname the name of the library loaded
  * @param lib_ret the object returned by the plugin initializer
  */
-static void
-load_plugin (void *cls, const char *libname, void *lib_ret)
+static enum GNUNET_GenericReturnValue
+setup_plugin (const char *name,
+              GNUNET_REST_ProcessingFunction proc,
+              void *plugin_cls)
 {
-  struct GNUNET_REST_Plugin *plugin = lib_ret;
   struct PluginListEntry *ple;
 
-  if (NULL == lib_ret)
+  if (NULL == plugin_cls)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Could not load plugin `%s'\n",
-                libname);
-    return;
+                "Could not load plugin\n");
+    return GNUNET_SYSERR;
   }
-  GNUNET_assert (1 < strlen (plugin->name));
-  GNUNET_assert ('/' == *plugin->name);
+  GNUNET_assert (1 < strlen (name));
+  GNUNET_assert ('/' == *name);
   ple = GNUNET_new (struct PluginListEntry);
-  ple->libname = GNUNET_strdup (libname);
-  ple->plugin = plugin;
+  ple->libname = GNUNET_strdup (name);
+  ple->plugin = plugin_cls;
+  ple->process_request = proc;
   GNUNET_CONTAINER_DLL_insert (plugins_head,
                                plugins_tail,
                                ple);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded plugin `%s'\n", libname);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded plugin `%s'\n", name);
+  return GNUNET_OK;
 }
 
 
@@ -1201,7 +1246,8 @@ run (void *cls,
       memset (basic_auth_secret_tmp, 0, 16);
       if (GNUNET_SYSERR == GNUNET_DISK_fn_read (basic_auth_file,
                                                 basic_auth_secret_tmp,
-                                                sizeof (basic_auth_secret_tmp) - 1))
+                                                sizeof (basic_auth_secret_tmp)
+                                                - 1))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     "Unable to read basic auth secret file.\n");
@@ -1330,12 +1376,45 @@ run (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-/* Load plugins */
-  GNUNET_PLUGIN_load_all_in_context (GNUNET_OS_project_data_default (),
-                                     "libgnunet_plugin_rest",
-                                     (void *) cfg,
-                                     &load_plugin,
-                                     NULL);
+  /* Load plugins */
+  // FIXME: Use per-plugin rest plugin structs
+  struct GNUNET_REST_Plugin *config_plugin = REST_config_init (cfg);
+  if (GNUNET_OK != setup_plugin (config_plugin->name, &REST_config_process_request, config_plugin))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+  }
+  struct GNUNET_REST_Plugin *copying_plugin = REST_copying_init (cfg);
+  if (GNUNET_OK != setup_plugin (copying_plugin->name, &REST_copying_process_request, copying_plugin))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+  }
+  struct GNUNET_REST_Plugin *identity_plugin = REST_identity_init (cfg);
+  if (GNUNET_OK != setup_plugin (identity_plugin->name, &REST_identity_process_request, identity_plugin))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+  }
+  struct GNUNET_REST_Plugin *namestore_plugin = REST_namestore_init (cfg);
+  if (GNUNET_OK != setup_plugin (namestore_plugin->name, &REST_namestore_process_request, namestore_plugin))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+  }
+  struct GNUNET_REST_Plugin *gns_plugin = REST_gns_init (cfg);
+  if (GNUNET_OK != setup_plugin (gns_plugin->name, &REST_gns_process_request, gns_plugin))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+  }
+#ifdef HAVE_JOSE
+  struct GNUNET_REST_Plugin *openid_plugin = REST_openid_init (cfg);
+  if (GNUNET_OK != setup_plugin (openid_plugin->name, &REST_openid_process_request, openid_plugin))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+  }
+#endif
+  struct GNUNET_REST_Plugin *reclaim_plugin = REST_reclaim_init (cfg);
+  if (GNUNET_OK != setup_plugin (reclaim_plugin->name, &REST_reclaim_process_request, reclaim_plugin))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+  }
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
 }
 
diff --git a/src/rest-plugin/identity/plugin_rest_identity.c b/src/service/rest/identity_plugin.c
index e7b7f8a9c..f6c9dd792 100644
--- a/src/rest-plugin/identity/plugin_rest_identity.c
+++ b/src/service/rest/identity_plugin.c
@@ -106,7 +106,7 @@
 /**
  * The configuration handle
  */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+const struct GNUNET_CONFIGURATION_Handle *id_cfg;
 
 /**
  * HTTP methods allows for this plugin
@@ -921,6 +921,7 @@ ego_delete_name (struct GNUNET_REST_RequestHandle *con_handle,
                                        handle);
 }
 
+
 struct ego_sign_data_cls
 {
   void *data;
@@ -952,10 +953,10 @@ ego_sign_data_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
     return;
   }
 
-  if ( GNUNET_OK != GNUNET_CRYPTO_eddsa_sign_raw (&(ego->pk.eddsa_key),
-                                                  (void *) data,
-                                                  strlen ( (char*) data),
-                                                  &sig))
+  if (GNUNET_OK != GNUNET_CRYPTO_eddsa_sign_raw (&(ego->pk.eddsa_key),
+                                                 (void *) data,
+                                                 strlen ( (char*) data),
+                                                 &sig))
   {
     handle->ec = GNUNET_EC_UNKNOWN;
     GNUNET_SCHEDULER_add_now (&do_error, handle);
@@ -980,6 +981,7 @@ ego_sign_data_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
   GNUNET_SCHEDULER_add_now (&cleanup_handle, handle);
 }
 
+
 /**
  *
  * @param con_handle the connection handle
@@ -1030,12 +1032,13 @@ ego_sign_data (struct GNUNET_REST_RequestHandle *con_handle,
   cls2->data = (void *) GNUNET_strdup (data);
   cls2->handle = handle;
 
-  GNUNET_IDENTITY_ego_lookup (cfg,
+  GNUNET_IDENTITY_ego_lookup (id_cfg,
                               username,
                               ego_sign_data_cb,
                               cls2);
 }
 
+
 /**
  * Respond to OPTIONS request
  *
@@ -1155,10 +1158,11 @@ list_ego (void *cls,
  * @param proc_cls closure for callback function
  * @return GNUNET_OK if request accepted
  */
-static enum GNUNET_GenericReturnValue
-rest_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                      GNUNET_REST_ResultProcessor proc,
-                      void *proc_cls)
+enum GNUNET_GenericReturnValue
+REST_identity_process_request (void* plugin,
+                               struct GNUNET_REST_RequestHandle *rest_handle,
+                               GNUNET_REST_ResultProcessor proc,
+                               void *proc_cls)
 {
   struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
   struct GNUNET_REST_RequestHandlerError err;
@@ -1218,20 +1222,19 @@ rest_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
  * @return NULL on error, otherwise the plugin context
  */
 void *
-libgnunet_plugin_rest_identity_init (void *cls)
+REST_identity_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static struct Plugin plugin;
   struct GNUNET_REST_Plugin *api;
 
-  cfg = cls;
+  id_cfg = c;
   if (NULL != plugin.cfg)
     return NULL; /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
+  plugin.cfg = c;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_IDENTITY;
-  api->process_request = &rest_process_request;
   GNUNET_asprintf (&allow_methods,
                    "%s, %s, %s, %s, %s",
                    MHD_HTTP_METHOD_GET,
@@ -1240,7 +1243,7 @@ libgnunet_plugin_rest_identity_init (void *cls)
                    MHD_HTTP_METHOD_DELETE,
                    MHD_HTTP_METHOD_OPTIONS);
   state = ID_REST_STATE_INIT;
-  identity_handle = GNUNET_IDENTITY_connect (cfg, &list_ego, NULL);
+  identity_handle = GNUNET_IDENTITY_connect (id_cfg, &list_ego, NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _ ("Identity REST API initialized\n"));
   return api;
@@ -1253,10 +1256,9 @@ libgnunet_plugin_rest_identity_init (void *cls)
  * @param cls the plugin context (as returned by "init")
  * @return always NULL
  */
-void *
-libgnunet_plugin_rest_identity_done (void *cls)
+void
+REST_identity_done (struct GNUNET_REST_Plugin *api)
 {
-  struct GNUNET_REST_Plugin *api = cls;
   struct Plugin *plugin = api->cls;
   struct EgoEntry *ego_entry;
   struct EgoEntry *ego_tmp;
@@ -1279,7 +1281,6 @@ libgnunet_plugin_rest_identity_done (void *cls)
   GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Identity REST plugin is finished\n");
-  return NULL;
 }
 
 
diff --git a/src/service/rest/identity_plugin.h b/src/service/rest/identity_plugin.h
new file mode 100644
index 000000000..0886156c1
--- /dev/null
+++ b/src/service/rest/identity_plugin.h
@@ -0,0 +1,36 @@
+#include "gnunet_rest_plugin.h"
+/**
+ * Function processing the REST call
+ *
+ * @param method HTTP method
+ * @param url URL of the HTTP request
+ * @param data body of the HTTP request (optional)
+ * @param data_size length of the body
+ * @param proc callback function for the result
+ * @param proc_cls closure for @a proc
+ * @return #GNUNET_OK if request accepted
+ */
+enum GNUNET_GenericReturnValue
+REST_identity_process_request (void *plugin,
+                               struct GNUNET_REST_RequestHandle *conndata_handle,
+                               GNUNET_REST_ResultProcessor proc,
+                               void *proc_cls);
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*"
+ * @return NULL on error, otherwise the plugin context
+ */
+void*
+REST_identity_init (const struct GNUNET_CONFIGURATION_Handle *c);
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls the plugin context (as returned by "init")
+ * @return always NULL
+ */
+void
+REST_identity_done (struct GNUNET_REST_Plugin *api);
diff --git a/src/rest-plugin/reclaim/json_reclaim.c b/src/service/rest/json_reclaim.c
index b1ca7a4a5..b1ca7a4a5 100644
--- a/src/rest-plugin/reclaim/json_reclaim.c
+++ b/src/service/rest/json_reclaim.c
diff --git a/src/rest-plugin/reclaim/json_reclaim.h b/src/service/rest/json_reclaim.h
index 613ddf873..613ddf873 100644
--- a/src/rest-plugin/reclaim/json_reclaim.h
+++ b/src/service/rest/json_reclaim.h
diff --git a/src/service/rest/meson.build b/src/service/rest/meson.build
index 316724fdb..347cbb852 100644
--- a/src/service/rest/meson.build
+++ b/src/service/rest/meson.build
@@ -1,6 +1,16 @@
 libgnunetrest_src = ['rest.c']
 
-gnunetservicerest_src = ['gnunet-rest-server.c']
+gnunetservicerest_src = ['gnunet-rest-server.c',
+                         'config_plugin.c',
+                         'copying_plugin.c',
+                         'identity_plugin.c',
+                         'namestore_plugin.c',
+                         'gns_plugin.c',
+                         'openid_plugin.c',
+                         'oidc_helper.c',
+                         'json_reclaim.c',
+                         'reclaim_plugin.c',
+                         ]
 
 configure_file(input : 'rest.conf',
                output : 'rest.conf',
@@ -30,7 +40,19 @@ libgnunetrest_dep = declare_dependency(link_with : libgnunetrest)
 
 executable ('gnunet-rest-server',
             gnunetservicerest_src,
-            dependencies: [libgnunetrest_dep, libgnunetutil_dep, mhd_dep],
+            dependencies: [libgnunetrest_dep,
+                           libgnunetutil_dep,
+                           libgnunetidentity_dep,
+                           libgnunetgns_dep,
+                           libgnunetreclaim_dep,
+                           libgnunetnamestore_dep,
+                           libgnunetjson_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetgnsrecordjson_dep,
+                           json_dep,
+                           jose_dep,
+                           gcrypt_dep,
+                           mhd_dep],
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
diff --git a/src/plugin/namestore/plugin_rest_namestore.c b/src/service/rest/namestore_plugin.c
index 31e78e6dd..8c5b8b824 100644
--- a/src/plugin/namestore/plugin_rest_namestore.c
+++ b/src/service/rest/namestore_plugin.c
@@ -57,7 +57,7 @@
 /**
  * The configuration handle
  */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+const struct GNUNET_CONFIGURATION_Handle *ns_cfg;
 
 /**
  * HTTP methods allows for this plugin
@@ -333,7 +333,7 @@ do_error (void *cls)
   struct MHD_Response *resp;
   json_t *json_error = json_object ();
   char *response;
-  const char* emsg;
+  const char*emsg;
   int response_code;
 
   emsg = GNUNET_ErrorCode_get_hint (handle->ec);
@@ -788,6 +788,7 @@ import_next_cb (void *cls, enum GNUNET_ErrorCode ec)
   handle->rd_set_pos += sent_rds;
 }
 
+
 static void
 bulk_tx_start (void *cls, enum GNUNET_ErrorCode ec)
 {
@@ -920,7 +921,7 @@ namestore_import (struct GNUNET_REST_RequestHandle *con_handle,
   handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
 
   // We need a per-client connection for a transactional bulk import
-  handle->nc = GNUNET_NAMESTORE_connect (cfg);
+  handle->nc = GNUNET_NAMESTORE_connect (ns_cfg);
   if (NULL == handle->nc)
   {
     handle->ec = GNUNET_EC_NAMESTORE_UNKNOWN;
@@ -932,6 +933,7 @@ namestore_import (struct GNUNET_REST_RequestHandle *con_handle,
                                                       handle);
 }
 
+
 /**
  * Handle namestore POST/PUT request
  *
@@ -1238,10 +1240,11 @@ list_ego (void *cls,
  * @param proc_cls closure for callback function
  * @return GNUNET_OK if request accepted
  */
-static enum GNUNET_GenericReturnValue
-rest_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                      GNUNET_REST_ResultProcessor proc,
-                      void *proc_cls)
+enum GNUNET_GenericReturnValue
+REST_namestore_process_request (void *plugin,
+                                struct GNUNET_REST_RequestHandle *rest_handle,
+                                GNUNET_REST_ResultProcessor proc,
+                                void *proc_cls)
 {
   struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
   struct GNUNET_REST_RequestHandlerError err;
@@ -1291,20 +1294,19 @@ rest_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
  * @return NULL on error, otherwise the plugin context
  */
 void *
-libgnunet_plugin_rest_namestore_init (void *cls)
+REST_namestore_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static struct Plugin plugin;
   struct GNUNET_REST_Plugin *api;
 
-  cfg = cls;
+  ns_cfg = c;
   if (NULL != plugin.cfg)
     return NULL;   /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
+  plugin.cfg = c;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_NAMESTORE;
-  api->process_request = &rest_process_request;
   state = ID_REST_STATE_INIT;
   GNUNET_asprintf (&allow_methods,
                    "%s, %s, %s, %s, %s",
@@ -1313,8 +1315,8 @@ libgnunet_plugin_rest_namestore_init (void *cls)
                    MHD_HTTP_METHOD_PUT,
                    MHD_HTTP_METHOD_DELETE,
                    MHD_HTTP_METHOD_OPTIONS);
-  ns_handle = GNUNET_NAMESTORE_connect (cfg);
-  identity_handle = GNUNET_IDENTITY_connect (cfg, &list_ego, NULL);
+  ns_handle = GNUNET_NAMESTORE_connect (ns_cfg);
+  identity_handle = GNUNET_IDENTITY_connect (ns_cfg, &list_ego, NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _ (
                 "Namestore REST API initialized\n"));
@@ -1328,10 +1330,9 @@ libgnunet_plugin_rest_namestore_init (void *cls)
  * @param cls the plugin context (as returned by "init")
  * @return always NULL
  */
-void *
-libgnunet_plugin_rest_namestore_done (void *cls)
+void
+REST_namestore_done (struct GNUNET_REST_Plugin *api)
 {
-  struct GNUNET_REST_Plugin *api = cls;
   struct Plugin *plugin = api->cls;
   struct RequestHandle *request;
   struct EgoEntry *ego_entry;
@@ -1357,7 +1358,6 @@ libgnunet_plugin_rest_namestore_done (void *cls)
   GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore REST plugin is finished\n");
-  return NULL;
 }
 
 
diff --git a/src/service/rest/namestore_plugin.h b/src/service/rest/namestore_plugin.h
new file mode 100644
index 000000000..2bdf77546
--- /dev/null
+++ b/src/service/rest/namestore_plugin.h
@@ -0,0 +1,37 @@
+#include "gnunet_rest_plugin.h"
+/**
+ * Function processing the REST call
+ *
+ * @param method HTTP method
+ * @param url URL of the HTTP request
+ * @param data body of the HTTP request (optional)
+ * @param data_size length of the body
+ * @param proc callback function for the result
+ * @param proc_cls closure for @a proc
+ * @return #GNUNET_OK if request accepted
+ */
+enum GNUNET_GenericReturnValue
+REST_namestore_process_request (void *plugin,
+                                struct GNUNET_REST_RequestHandle *
+                                conndata_handle,
+                                GNUNET_REST_ResultProcessor proc,
+                                void *proc_cls);
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*"
+ * @return NULL on error, otherwise the plugin context
+ */
+void*
+REST_namestore_init (const struct GNUNET_CONFIGURATION_Handle *c);
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls the plugin context (as returned by "init")
+ * @return always NULL
+ */
+void
+REST_namestore_done (struct GNUNET_REST_Plugin *api);
diff --git a/src/rest-plugin/reclaim/oidc_helper.c b/src/service/rest/oidc_helper.c
index a2da7312b..a2da7312b 100644
--- a/src/rest-plugin/reclaim/oidc_helper.c
+++ b/src/service/rest/oidc_helper.c
diff --git a/src/rest-plugin/reclaim/oidc_helper.h b/src/service/rest/oidc_helper.h
index de788fbdb..de788fbdb 100644
--- a/src/rest-plugin/reclaim/oidc_helper.h
+++ b/src/service/rest/oidc_helper.h
diff --git a/src/rest-plugin/reclaim/plugin_rest_openid_connect.c b/src/service/rest/openid_plugin.c
index d0aee043e..a4f082d2a 100644
--- a/src/rest-plugin/reclaim/plugin_rest_openid_connect.c
+++ b/src/service/rest/openid_plugin.c
@@ -242,7 +242,7 @@
  * How long to wait for a consume in userinfo endpoint
  */
 #define CONSUME_TIMEOUT GNUNET_TIME_relative_multiply ( \
-    GNUNET_TIME_UNIT_SECONDS,2)
+          GNUNET_TIME_UNIT_SECONDS,2)
 
 /**
  * OIDC ignored parameter array
@@ -268,7 +268,7 @@ struct GNUNET_CONTAINER_MultiHashMap *OIDC_cookie_jar_map;
 /**
  * The configuration handle
  */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+const struct GNUNET_CONFIGURATION_Handle *oid_cfg;
 
 /**
  * HTTP methods allows for this plugin
@@ -905,6 +905,7 @@ read_jwk_from_file (const char *filename)
   return jwk;
 }
 
+
 /**
  * @brief Write the JWK to file. If unsuccessful emit warning
  *
@@ -927,6 +928,7 @@ write_jwk_to_file (const char *filename,
     return GNUNET_OK;
 }
 
+
 /**
  * @brief Generate a new RSA JSON Web Key
  *
@@ -942,6 +944,7 @@ generate_jwk ()
   return jwk;
 }
 
+
 /**
  * Return the path to the oidc directory path
  *
@@ -954,7 +957,7 @@ get_oidc_dir_path (void *cls)
   struct RequestHandle *handle = cls;
 
   // Read OIDC directory from config
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (oid_cfg,
                                                             "reclaim-rest-plugin",
                                                             "oidc_dir",
                                                             &oidc_directory))
@@ -970,6 +973,7 @@ get_oidc_dir_path (void *cls)
   return oidc_directory;
 }
 
+
 /**
  * Return the path to the RSA JWK key file
  *
@@ -1004,7 +1008,7 @@ login_redirect (void *cls)
   struct GNUNET_Buffer buf = { 0 };
   struct RequestHandle *handle = cls;
 
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg,
+  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (oid_cfg,
                                                           "reclaim-rest-plugin",
                                                           "address",
                                                           &login_base_url))
@@ -1451,8 +1455,8 @@ code_redirect (void *cls)
     {
       if (GNUNET_OK !=
           GNUNET_CRYPTO_public_key_from_string (handle->oidc
-                                                  ->login_identity,
-                                                  &pubkey))
+                                                ->login_identity,
+                                                &pubkey))
       {
         handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_COOKIE);
         handle->edesc =
@@ -1833,7 +1837,7 @@ authorize_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
 
   if (GNUNET_OK !=
       GNUNET_CRYPTO_public_key_from_string (handle->oidc->client_id,
-                                              &handle->oidc->client_pkey))
+                                            &handle->oidc->client_pkey))
   {
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_UNAUTHORIZED_CLIENT);
     handle->edesc = GNUNET_strdup ("The client is not authorized to request an "
@@ -1856,7 +1860,8 @@ authorize_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
     }
   }
   if (NULL == handle->tld)
-    GNUNET_CONFIGURATION_iterate_section_values (cfg, "gns", tld_iter, handle);
+    GNUNET_CONFIGURATION_iterate_section_values (oid_cfg, "gns", tld_iter,
+                                                 handle);
   if (NULL == handle->tld)
     handle->tld = GNUNET_strdup (handle->oidc->client_id);
   GNUNET_SCHEDULER_add_now (&build_authz_response, handle);
@@ -2085,7 +2090,7 @@ check_authorization (struct RequestHandle *handle,
   }
 
   // check client password
-  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg,
+  if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (oid_cfg,
                                                           "reclaim-rest-plugin",
                                                           "OIDC_CLIENT_HMAC_SECRET",
                                                           &expected_pass))
@@ -2277,7 +2282,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
     GNUNET_free (code_verifier);
 
   // create jwt
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg,
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (oid_cfg,
                                                         "reclaim-rest-plugin",
                                                         "expiration_time",
                                                         &expiration_time))
@@ -2295,7 +2300,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   }
 
   // Check if HMAC or RSA should be used
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (oid_cfg,
                                                           "reclaim-rest-plugin",
                                                           "oidc_json_web_algorithm",
                                                           &jwa))
@@ -2306,7 +2311,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
     jwa = JWT_ALG_VALUE_RSA;
   }
 
-  if ( ! strcmp (jwa, JWT_ALG_VALUE_RSA))
+  if (! strcmp (jwa, JWT_ALG_VALUE_RSA))
   {
     // Replace for now
     oidc_jwk_path = get_oidc_jwk_path (cls);
@@ -2341,10 +2346,10 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
                                            (NULL != nonce) ? nonce : NULL,
                                            oidc_jwk);
   }
-  else if ( ! strcmp (jwa, JWT_ALG_VALUE_HMAC))
+  else if (! strcmp (jwa, JWT_ALG_VALUE_HMAC))
   {
     // TODO OPTIONAL acr,amr,azp
-    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
+    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (oid_cfg,
                                                             "reclaim-rest-plugin",
                                                             "jwt_secret",
                                                             &jwt_secret))
@@ -2708,6 +2713,7 @@ userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   GNUNET_free (authorization);
 }
 
+
 /**
  * Responds to /jwks.json
  *
@@ -2763,6 +2769,7 @@ jwks_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   cleanup_handle (handle);
 }
 
+
 /**
  * If listing is enabled, prints information about the egos.
  *
@@ -2997,10 +3004,11 @@ oidc_config_cors (struct GNUNET_REST_RequestHandle *con_handle,
 }
 
 
-static enum GNUNET_GenericReturnValue
-rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                               GNUNET_REST_ResultProcessor proc,
-                               void *proc_cls)
+enum GNUNET_GenericReturnValue
+REST_openid_process_request (void *plugin,
+                             struct GNUNET_REST_RequestHandle *rest_handle,
+                             GNUNET_REST_ResultProcessor proc,
+                             void *proc_cls)
 {
   struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
   struct GNUNET_REST_RequestHandlerError err;
@@ -3056,24 +3064,23 @@ rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
    * @return NULL on error, otherwise the plugin context
    */
 void *
-libgnunet_plugin_rest_openid_connect_init (void *cls)
+REST_openid_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static struct Plugin plugin;
   struct GNUNET_REST_Plugin *api;
 
-  cfg = cls;
+  oid_cfg = c;
   if (NULL != plugin.cfg)
     return NULL;     /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
+  plugin.cfg = oid_cfg;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_OIDC;
-  api->process_request = &rest_identity_process_request;
-  identity_handle = GNUNET_IDENTITY_connect (cfg, &list_ego, NULL);
-  gns_handle = GNUNET_GNS_connect (cfg);
-  idp = GNUNET_RECLAIM_connect (cfg);
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg,
+  identity_handle = GNUNET_IDENTITY_connect (oid_cfg, &list_ego, NULL);
+  gns_handle = GNUNET_GNS_connect (oid_cfg);
+  idp = GNUNET_RECLAIM_connect (oid_cfg);
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (oid_cfg,
                                                         "reclaim-rest-plugin",
                                                         "OIDC_USERINFO_CONSUME_TIMEOUT",
                                                         &consume_timeout))
@@ -3112,7 +3119,7 @@ cleanup_hashmap (void *cls, const struct GNUNET_HashCode *key, void *value)
    * @return always NULL
    */
 void *
-libgnunet_plugin_rest_openid_connect_done (void *cls)
+REST_openid_done (void *cls)
 {
   struct GNUNET_REST_Plugin *api = cls;
   struct Plugin *plugin = api->cls;
diff --git a/src/service/rest/openid_plugin.h b/src/service/rest/openid_plugin.h
new file mode 100644
index 000000000..65545ac66
--- /dev/null
+++ b/src/service/rest/openid_plugin.h
@@ -0,0 +1,36 @@
+#include "gnunet_rest_plugin.h"
+/**
+ * Function processing the REST call
+ *
+ * @param method HTTP method
+ * @param url URL of the HTTP request
+ * @param data body of the HTTP request (optional)
+ * @param data_size length of the body
+ * @param proc callback function for the result
+ * @param proc_cls closure for @a proc
+ * @return #GNUNET_OK if request accepted
+ */
+enum GNUNET_GenericReturnValue
+REST_openid_process_request (void *plugin,
+                             struct GNUNET_REST_RequestHandle *conndata_handle,
+                             GNUNET_REST_ResultProcessor proc,
+                             void *proc_cls);
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*"
+ * @return NULL on error, otherwise the plugin context
+ */
+void*
+REST_openid_init (const struct GNUNET_CONFIGURATION_Handle *c);
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls the plugin context (as returned by "init")
+ * @return always NULL
+ */
+void
+REST_openid_done (struct GNUNET_REST_Plugin *api);
diff --git a/src/rest-plugin/reclaim/plugin_rest_pabc.c b/src/service/rest/pabc_plugin.c
index 4b7d21df3..4b7d21df3 100644
--- a/src/rest-plugin/reclaim/plugin_rest_pabc.c
+++ b/src/service/rest/pabc_plugin.c
diff --git a/src/rest-plugin/reclaim/plugin_rest_reclaim.c b/src/service/rest/reclaim_plugin.c
index b2586109a..677a6a676 100644
--- a/src/rest-plugin/reclaim/plugin_rest_reclaim.c
+++ b/src/service/rest/reclaim_plugin.c
@@ -80,7 +80,7 @@
 /**
  * The configuration handle
  */
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+const struct GNUNET_CONFIGURATION_Handle *rcfg;
 
 /**
  * HTTP methods allows for this plugin
@@ -317,7 +317,8 @@ do_error (void *cls)
     handle->response_code = MHD_HTTP_BAD_REQUEST;
   }
   resp = GNUNET_REST_create_response (json_error);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp, "Content-Type", "application/json"));
+  GNUNET_assert (MHD_NO != MHD_add_response_header (resp, "Content-Type",
+                                                    "application/json"));
   handle->proc (handle->proc_cls, resp, handle->response_code);
   cleanup_handle (handle);
   GNUNET_free (json_error);
@@ -1316,7 +1317,9 @@ options_cont (struct GNUNET_REST_RequestHandle *con_handle,
 
   // For now, independent of path return all options
   resp = GNUNET_REST_create_response (NULL);
-  GNUNET_assert (MHD_NO != MHD_add_response_header (resp, "Access-Control-Allow-Methods", allow_methods));
+  GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
+                                                    "Access-Control-Allow-Methods",
+                                                    allow_methods));
   handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
   cleanup_handle (handle);
   return;
@@ -1431,10 +1434,10 @@ list_ego (void *cls,
 }
 
 
-static enum GNUNET_GenericReturnValue
-rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
-                               GNUNET_REST_ResultProcessor proc,
-                               void *proc_cls)
+enum GNUNET_GenericReturnValue
+REST_reclaim_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
+                              GNUNET_REST_ResultProcessor proc,
+                              void *proc_cls)
 {
   struct RequestHandle *handle = GNUNET_new (struct RequestHandle);
   struct GNUNET_REST_RequestHandlerError err;
@@ -1492,20 +1495,19 @@ rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle,
  * @return NULL on error, otherwise the plugin context
  */
 void *
-libgnunet_plugin_rest_reclaim_init (void *cls)
+REST_reclaim_init (struct GNUNET_CONFIGURATION_Handle *c)
 {
   static struct Plugin plugin;
   struct GNUNET_REST_Plugin *api;
 
-  cfg = cls;
+  rcfg = c;
   if (NULL != plugin.cfg)
     return NULL; /* can only initialize once! */
   memset (&plugin, 0, sizeof(struct Plugin));
-  plugin.cfg = cfg;
+  plugin.cfg = rcfg;
   api = GNUNET_new (struct GNUNET_REST_Plugin);
   api->cls = &plugin;
   api->name = GNUNET_REST_API_NS_RECLAIM;
-  api->process_request = &rest_identity_process_request;
   GNUNET_asprintf (&allow_methods,
                    "%s, %s, %s, %s, %s",
                    MHD_HTTP_METHOD_GET,
@@ -1513,9 +1515,9 @@ libgnunet_plugin_rest_reclaim_init (void *cls)
                    MHD_HTTP_METHOD_PUT,
                    MHD_HTTP_METHOD_DELETE,
                    MHD_HTTP_METHOD_OPTIONS);
-  identity_handle = GNUNET_IDENTITY_connect (cfg, &list_ego, NULL);
+  identity_handle = GNUNET_IDENTITY_connect (rcfg, &list_ego, NULL);
   state = ID_REST_STATE_INIT;
-  idp = GNUNET_RECLAIM_connect (cfg);
+  idp = GNUNET_RECLAIM_connect (rcfg);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               _ ("Identity Provider REST API initialized\n"));
   return api;
@@ -1529,9 +1531,8 @@ libgnunet_plugin_rest_reclaim_init (void *cls)
  * @return always NULL
  */
 void *
-libgnunet_plugin_rest_reclaim_done (void *cls)
+REST_reclaim_done (struct GNUNET_REST_Plugin *api)
 {
-  struct GNUNET_REST_Plugin *api = cls;
   struct Plugin *plugin = api->cls;
   struct RequestHandle *request;
   struct EgoEntry *ego_entry;
diff --git a/src/service/rest/reclaim_plugin.h b/src/service/rest/reclaim_plugin.h
new file mode 100644
index 000000000..102fd827e
--- /dev/null
+++ b/src/service/rest/reclaim_plugin.h
@@ -0,0 +1,36 @@
+#include "gnunet_rest_plugin.h"
+/**
+ * Function processing the REST call
+ *
+ * @param method HTTP method
+ * @param url URL of the HTTP request
+ * @param data body of the HTTP request (optional)
+ * @param data_size length of the body
+ * @param proc callback function for the result
+ * @param proc_cls closure for @a proc
+ * @return #GNUNET_OK if request accepted
+ */
+enum GNUNET_GenericReturnValue
+REST_reclaim_process_request (void *plugin,
+                               struct GNUNET_REST_RequestHandle *conndata_handle,
+                               GNUNET_REST_ResultProcessor proc,
+                               void *proc_cls);
+
+/**
+ * Entry point for the plugin.
+ *
+ * @param cls the "struct GNUNET_NAMESTORE_PluginEnvironment*"
+ * @return NULL on error, otherwise the plugin context
+ */
+void*
+REST_reclaim_init (const struct GNUNET_CONFIGURATION_Handle *c);
+
+
+/**
+ * Exit point from the plugin.
+ *
+ * @param cls the plugin context (as returned by "init")
+ * @return always NULL
+ */
+void
+REST_reclaim_done (struct GNUNET_REST_Plugin *api);
diff --git a/src/service/revocation/Makefile.am b/src/service/revocation/Makefile.am
index 726c75ab6..18bf21fb0 100644
--- a/src/service/revocation/Makefile.am
+++ b/src/service/revocation/Makefile.am
@@ -29,7 +29,7 @@ libgnunetrevocation_la_SOURCES = \
   revocation_api.c revocation.h
 libgnunetrevocation_la_LIBADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL) $(XLIB) -lgcrypt
 libgnunetrevocation_la_LDFLAGS = \
@@ -46,7 +46,7 @@ gnunet_service_revocation_LDADD = \
   $(top_builddir)/src/service/core/libgnunetcore.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/gnsrecord/libgnunetgnsrecord.la  \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   -lm \
   $(GN_LIBINTL)
diff --git a/src/service/revocation/gnunet-service-revocation.c b/src/service/revocation/gnunet-service-revocation.c
index 3755b87e5..8a8610758 100644
--- a/src/service/revocation/gnunet-service-revocation.c
+++ b/src/service/revocation/gnunet-service-revocation.c
@@ -38,6 +38,7 @@
 #include "platform.h"
 #include <math.h>
 #include "gnunet_util_lib.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_protocols.h"
@@ -172,13 +173,13 @@ new_peer_entry (const struct GNUNET_PeerIdentity *peer)
 static enum GNUNET_GenericReturnValue
 verify_revoke_message (const struct RevokeMessage *rm)
 {
-  const struct GNUNET_REVOCATION_PowP *pow
-    = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
+  const struct GNUNET_GNSRECORD_PowP *pow
+    = (const struct GNUNET_GNSRECORD_PowP *) &rm[1];
 
   if (GNUNET_YES !=
-      GNUNET_REVOCATION_check_pow (pow,
-                                   (unsigned int) revocation_work_required,
-                                   epoch_duration))
+      GNUNET_GNSRECORD_check_pow (pow,
+                                  (unsigned int) revocation_work_required,
+                                  epoch_duration))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Proof of work invalid!\n");
@@ -221,6 +222,7 @@ client_disconnect_cb (void *cls,
   GNUNET_assert (client == app_cls);
 }
 
+
 static int
 check_query_message (void *cls,
                      const struct QueryMessage *qm)
@@ -261,7 +263,7 @@ handle_query_message (void *cls,
   key_len = ntohl (qm->key_len);
   if ((GNUNET_SYSERR ==
        GNUNET_CRYPTO_read_public_key_from_buffer (&qm[1], key_len,
-                                                    &zone, &read)) ||
+                                                  &zone, &read)) ||
       (read != key_len))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -342,8 +344,8 @@ publicize_rm (const struct RevokeMessage *rm)
   struct GNUNET_HashCode hc;
   struct GNUNET_SETU_Element e;
   ssize_t pklen;
-  const struct GNUNET_REVOCATION_PowP *pow
-    = (const struct GNUNET_REVOCATION_PowP *) &rm[1];
+  const struct GNUNET_GNSRECORD_PowP *pow
+    = (const struct GNUNET_GNSRECORD_PowP *) &rm[1];
   const struct GNUNET_CRYPTO_PublicKey *pk
     = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
 
@@ -980,8 +982,8 @@ run (void *cls,
       GNUNET_free (fn);
       return;
     }
-    struct GNUNET_REVOCATION_PowP *pow = (struct
-                                          GNUNET_REVOCATION_PowP *) &rm[1];
+    struct GNUNET_GNSRECORD_PowP *pow = (struct
+                                         GNUNET_GNSRECORD_PowP *) &rm[1];
     ssize_t ksize;
     pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
     ksize = GNUNET_CRYPTO_public_key_get_length (pk);
diff --git a/src/service/revocation/meson.build b/src/service/revocation/meson.build
index 14e352ffa..57f19f115 100644
--- a/src/service/revocation/meson.build
+++ b/src/service/revocation/meson.build
@@ -19,7 +19,9 @@ libgnunetrevocation = library('gnunetrevocation',
         libgnunetrevocation_src,
         soversion: '0',
         version: '0.0.0',
-        dependencies: [libgnunetutil_dep, libgnunetidentity_dep],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetgnsrecord_dep,
+                       libgnunetidentity_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
         install_dir: get_option('libdir'))
@@ -34,6 +36,7 @@ executable ('gnunet-service-revocation',
                            libgnunetstatistics_dep,
                            libgnunetcore_dep,
                            libgnunetsetu_dep,
+                           libgnunetgnsrecord_dep,
                            libgnunetidentity_dep],
             include_directories: [incdir, configuration_inc],
             install: true,
diff --git a/src/service/revocation/revocation.h b/src/service/revocation/revocation.h
index 90b8c7da0..cbb36acfb 100644
--- a/src/service/revocation/revocation.h
+++ b/src/service/revocation/revocation.h
@@ -112,13 +112,4 @@ struct RevocationResponseMessage
 
 GNUNET_NETWORK_STRUCT_END
 
-/**
- * Create the revocation metadata to sign for a revocation message
- *
- * @param pow the PoW to sign
- * @return the signature purpose
- */
-struct GNUNET_REVOCATION_SignaturePurposePS *
-REV_create_signature_message (const struct GNUNET_REVOCATION_PowP *pow);
-
 #endif
diff --git a/src/service/revocation/revocation_api.c b/src/service/revocation/revocation_api.c
index 3b7d83710..0e3641af8 100644
--- a/src/service/revocation/revocation_api.c
+++ b/src/service/revocation/revocation_api.c
@@ -52,60 +52,6 @@ struct GNUNET_REVOCATION_Query
 
 
 /**
- * Helper struct that holds a found pow nonce
- * and the corresponding number of leading zeros.
- */
-struct BestPow
-{
-  /**
-   * PoW nonce
-   */
-  uint64_t pow;
-
-  /**
-   * Corresponding zero bits in hash
-   */
-  unsigned int bits;
-};
-
-
-/**
- * The handle to a PoW calculation.
- * Used in iterative PoW rounds.
- */
-struct GNUNET_REVOCATION_PowCalculationHandle
-{
-  /**
-   * Current set of found PoWs
-   */
-  struct BestPow best[POW_COUNT];
-
-  /**
-   * The final PoW result data structure.
-   */
-  struct GNUNET_REVOCATION_PowP *pow;
-
-  /**
-   * The current nonce to try
-   */
-  uint64_t current_pow;
-
-  /**
-   * Epochs how long the PoW should be valid.
-   * This is added on top of the difficulty in the PoW.
-   */
-  unsigned int epochs;
-
-  /**
-   * The difficulty (leading zeros) to achieve.
-   */
-  unsigned int difficulty;
-
-};
-
-static struct GNUNET_CRYPTO_PowSalt salt = { "GnsRevocationPow" };
-
-/**
  * Generic error handler, called with the appropriate
  * error code and the same closure specified at the creation of
  * the message queue.
@@ -301,7 +247,7 @@ handle_revocation_response (void *cls,
  */
 struct GNUNET_REVOCATION_Handle *
 GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          const struct GNUNET_REVOCATION_PowP *pow,
+                          const struct GNUNET_GNSRECORD_PowP *pow,
                           GNUNET_REVOCATION_Callback func,
                           void *func_cls)
 {
@@ -339,9 +285,9 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_free (h);
     return NULL;
   }
-  if (GNUNET_YES != GNUNET_REVOCATION_check_pow (pow,
-                                                 (unsigned int) matching_bits,
-                                                 epoch_duration))
+  if (GNUNET_YES != GNUNET_GNSRECORD_check_pow (pow,
+                                                (unsigned int) matching_bits,
+                                                epoch_duration))
   {
     GNUNET_break (0);
     GNUNET_free (h);
@@ -361,7 +307,7 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg,
   }
   h->func = func;
   h->func_cls = func_cls;
-  size_t extra_len = GNUNET_REVOCATION_proof_get_size (pow);
+  size_t extra_len = GNUNET_GNSRECORD_proof_get_size (pow);
   env = GNUNET_MQ_msg_extra (rm,
                              extra_len,
                              GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE);
@@ -385,380 +331,4 @@ GNUNET_REVOCATION_revoke_cancel (struct GNUNET_REVOCATION_Handle *h)
 }
 
 
-/**
- * Calculate the average zeros in the pows.
- *
- * @param ph the PowHandle
- * @return the average number of zeros.
- */
-static unsigned int
-calculate_score (const struct GNUNET_REVOCATION_PowCalculationHandle *ph)
-{
-  double sum = 0.0;
-  for (unsigned int j = 0; j<POW_COUNT; j++)
-    sum += ph->best[j].bits;
-  double avg = sum / POW_COUNT;
-  return avg;
-}
-
-
-struct GNUNET_REVOCATION_SignaturePurposePS *
-REV_create_signature_message (const struct GNUNET_REVOCATION_PowP *pow)
-{
-  struct GNUNET_REVOCATION_SignaturePurposePS *spurp;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-  size_t ksize;
-
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  spurp = GNUNET_malloc (sizeof (*spurp) + ksize);
-  spurp->timestamp = pow->timestamp;
-  spurp->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_GNS_REVOCATION);
-  spurp->purpose.size = htonl (sizeof(*spurp) + ksize);
-  GNUNET_CRYPTO_write_public_key_to_buffer (pk,
-                                              (char*) &spurp[1],
-                                              ksize);
-  return spurp;
-}
-
-
-enum GNUNET_GenericReturnValue
-check_signature_identity (const struct GNUNET_REVOCATION_PowP *pow,
-                          const struct GNUNET_CRYPTO_PublicKey *key)
-{
-  struct GNUNET_REVOCATION_SignaturePurposePS *spurp;
-  unsigned char *sig;
-  size_t ksize;
-  int ret;
-
-  ksize = GNUNET_CRYPTO_public_key_get_length (key);
-  spurp = REV_create_signature_message (pow);
-  sig = ((unsigned char*) &pow[1] + ksize);
-  ret =
-    GNUNET_CRYPTO_signature_verify_raw_ (
-      GNUNET_SIGNATURE_PURPOSE_GNS_REVOCATION,
-      &spurp->purpose,
-      sig,
-      key);
-  GNUNET_free (spurp);
-  return ret == GNUNET_OK ? GNUNET_OK : GNUNET_SYSERR;
-}
-
-
-enum GNUNET_GenericReturnValue
-check_signature (const struct GNUNET_REVOCATION_PowP *pow)
-{
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  return check_signature_identity (pow, pk);
-}
-
-
-/**
- * Check if the given proof-of-work is valid.
- *
- * @param pow proof of work
- * @param difficulty how many bits must match (configuration) LSD0001: D
- * @param epoch_duration length of single epoch in configuration
- * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-GNUNET_REVOCATION_check_pow (const struct GNUNET_REVOCATION_PowP *pow,
-                             unsigned int difficulty,
-                             struct GNUNET_TIME_Relative epoch_duration)
-{
-  char buf[sizeof(struct GNUNET_CRYPTO_PublicKey)
-           + sizeof (struct GNUNET_TIME_AbsoluteNBO)
-           + sizeof (uint64_t)] GNUNET_ALIGN;
-  struct GNUNET_HashCode result;
-  struct GNUNET_TIME_Absolute ts;
-  struct GNUNET_TIME_Absolute exp;
-  struct GNUNET_TIME_Relative ttl;
-  struct GNUNET_TIME_Relative buffer;
-  /* LSD0001: D' */
-  unsigned int score = 0;
-  unsigned int tmp_score = 0;
-  unsigned int epochs;
-  uint64_t pow_val;
-  ssize_t pklen;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-
-  /**
-   * Check if signature valid
-   */
-  if (GNUNET_OK != check_signature (pow))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Proof of work signature invalid!\n");
-    return GNUNET_SYSERR;
-  }
-
-  /**
-   * First, check if PoW set is strictly monotically increasing
-   */
-  for (unsigned int i = 0; i < POW_COUNT - 1; i++)
-  {
-    if (GNUNET_ntohll (pow->pow[i]) >= GNUNET_ntohll (pow->pow[i + 1]))
-      return GNUNET_NO;
-  }
-  GNUNET_memcpy (&buf[sizeof(uint64_t)],
-                 &pow->timestamp,
-                 sizeof (uint64_t));
-  pklen = GNUNET_CRYPTO_public_key_get_length (pk);
-  if (0 > pklen)
-  {
-    GNUNET_break (0);
-    return GNUNET_NO;
-  }
-  GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
-                 pk,
-                 pklen);
-  for (unsigned int i = 0; i < POW_COUNT; i++)
-  {
-    pow_val = GNUNET_ntohll (pow->pow[i]);
-    GNUNET_memcpy (buf, &pow->pow[i], sizeof(uint64_t));
-    GNUNET_CRYPTO_pow_hash (&salt,
-                            buf,
-                            sizeof(buf),
-                            &result);
-    tmp_score = GNUNET_CRYPTO_hash_count_leading_zeros (&result);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Score %u with %" PRIu64 " (#%u)\n",
-                tmp_score, pow_val, i);
-
-    score += tmp_score;
-
-  }
-  score = score / POW_COUNT;
-  if (score < difficulty)
-    return GNUNET_NO;
-  /* LSD0001: (D'-D+1) */
-  epochs = score - difficulty + 1;
-
-  /**
-   * Check expiration
-   */
-  ts = GNUNET_TIME_absolute_ntoh (pow->timestamp);
-  ttl = GNUNET_TIME_relative_multiply (epoch_duration,
-                                       epochs);
-  /**
-   * Extend by 10% for unsynchronized clocks
-   */
-  buffer = GNUNET_TIME_relative_divide (epoch_duration,
-                                        10);
-  exp = GNUNET_TIME_absolute_add (ts, ttl);
-  exp = GNUNET_TIME_absolute_add (exp,
-                                  buffer);
-
-  if (0 != GNUNET_TIME_absolute_get_remaining (ts).rel_value_us)
-    return GNUNET_NO; /* Not yet valid. */
-  /* Revert to actual start time */
-  ts = GNUNET_TIME_absolute_add (ts,
-                                 buffer);
-
-  if (0 == GNUNET_TIME_absolute_get_remaining (exp).rel_value_us)
-    return GNUNET_NO; /* expired */
-  return GNUNET_YES;
-}
-
-
-enum GNUNET_GenericReturnValue
-sign_pow_identity (const struct GNUNET_CRYPTO_PrivateKey *key,
-                   struct GNUNET_REVOCATION_PowP *pow)
-{
-  struct GNUNET_TIME_Absolute ts = GNUNET_TIME_absolute_get ();
-  struct GNUNET_REVOCATION_SignaturePurposePS *rp;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-  size_t ksize;
-  char *sig;
-
-  /**
-   * Predate the validity period to prevent rejections due to
-   * unsynchronized clocks
-   */
-  ts = GNUNET_TIME_absolute_subtract (ts,
-                                      GNUNET_TIME_UNIT_WEEKS);
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  pow->timestamp = GNUNET_TIME_absolute_hton (ts);
-  rp = REV_create_signature_message (pow);
-  sig = ((char*) &pow[1]) + ksize;
-  int result = GNUNET_CRYPTO_sign_raw_ (key,
-                                          &rp->purpose,
-                                          (void*) sig);
-  GNUNET_free (rp);
-  if (result == GNUNET_SYSERR)
-    return GNUNET_NO;
-  else
-    return result;
-}
-
-
-enum GNUNET_GenericReturnValue
-sign_pow (const struct GNUNET_CRYPTO_PrivateKey *key,
-          struct GNUNET_REVOCATION_PowP *pow)
-{
-  struct GNUNET_CRYPTO_PublicKey *pk;
-
-  pk = (struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  GNUNET_CRYPTO_key_get_public (key, pk);
-  return sign_pow_identity (key, pow);
-}
-
-
-/**
- * Initializes a fresh PoW computation.
- *
- * @param key the key to calculate the PoW for.
- * @param[out] pow starting point for PoW calculation (not yet valid)
- */
-void
-GNUNET_REVOCATION_pow_init (const struct GNUNET_CRYPTO_PrivateKey *key,
-                            struct GNUNET_REVOCATION_PowP *pow)
-{
-  GNUNET_assert (GNUNET_OK == sign_pow (key, pow));
-}
-
-
-struct GNUNET_REVOCATION_PowCalculationHandle*
-GNUNET_REVOCATION_pow_start (struct GNUNET_REVOCATION_PowP *pow,
-                             int epochs,
-                             unsigned int difficulty)
-{
-  struct GNUNET_REVOCATION_PowCalculationHandle *pc;
-  struct GNUNET_TIME_Relative ttl;
-
-
-  pc = GNUNET_new (struct GNUNET_REVOCATION_PowCalculationHandle);
-  pc->pow = pow;
-  ttl = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS,
-                                       epochs);
-  pc->pow->ttl = GNUNET_TIME_relative_hton (ttl);
-  pc->current_pow = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                              UINT64_MAX);
-  pc->difficulty = difficulty;
-  pc->epochs = epochs;
-  return pc;
-}
-
-
-/**
- * Comparison function for quicksort
- *
- * @param a left element
- * @param b right element
- * @return a-b
- */
-static int
-cmp_pow_value (const void *a, const void *b)
-{
-  return (GNUNET_ntohll (*(uint64_t*) a) - GNUNET_ntohll (*(uint64_t*) b));
-}
-
-
-/**
- * Calculate a key revocation valid for broadcasting for a number
- * of epochs.
- *
- * @param pc handle to the PoW, initially called with NULL.
- * @param epochs number of epochs for which the revocation must be valid.
- * @param pow current pow value to try
- * @param difficulty current base difficulty to achieve
- * @return #GNUNET_YES if the @a pow is acceptable, #GNUNET_NO if not
- */
-enum GNUNET_GenericReturnValue
-GNUNET_REVOCATION_pow_round (struct GNUNET_REVOCATION_PowCalculationHandle *pc)
-{
-  char buf[sizeof(struct GNUNET_CRYPTO_PublicKey)
-           + sizeof (uint64_t)
-           + sizeof (uint64_t)] GNUNET_ALIGN;
-  struct GNUNET_HashCode result;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-  unsigned int zeros;
-  int ret;
-  uint64_t pow_nbo;
-  ssize_t ksize;
-
-  pc->current_pow++;
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &(pc->pow[1]);
-
-  /**
-   * Do not try duplicates
-   */
-  for (unsigned int i = 0; i < POW_COUNT; i++)
-    if (pc->current_pow == pc->best[i].pow)
-      return GNUNET_NO;
-  pow_nbo = GNUNET_htonll (pc->current_pow);
-  GNUNET_memcpy (buf, &pow_nbo, sizeof(uint64_t));
-  GNUNET_memcpy (&buf[sizeof(uint64_t)],
-                 &pc->pow->timestamp,
-                 sizeof (uint64_t));
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  GNUNET_assert (0 < ksize);
-  GNUNET_memcpy (&buf[sizeof(uint64_t) * 2],
-                 pk,
-                 ksize);
-  GNUNET_CRYPTO_pow_hash (&salt,
-                          buf,
-                          sizeof(buf),
-                          &result);
-  zeros = GNUNET_CRYPTO_hash_count_leading_zeros (&result);
-  for (unsigned int i = 0; i < POW_COUNT; i++)
-  {
-    if (pc->best[i].bits < zeros)
-    {
-      pc->best[i].bits = zeros;
-      pc->best[i].pow = pc->current_pow;
-      pc->pow->pow[i] = pow_nbo;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "New best score %u with %" PRIu64 " (#%u)\n",
-                  zeros, pc->current_pow, i);
-
-      break;
-    }
-  }
-  ret = calculate_score (pc) >= pc->difficulty + pc->epochs ? GNUNET_YES :
-        GNUNET_NO;
-  if (GNUNET_YES == ret)
-  {
-    /* Sort POWs) */
-    qsort (pc->pow->pow, POW_COUNT, sizeof (uint64_t), &cmp_pow_value);
-  }
-  return ret;
-}
-
-
-/**
- * Stop a PoW calculation
- *
- * @param pc the calculation to clean up
- * @return #GNUNET_YES if pow valid, #GNUNET_NO if pow was set but is not
- * valid
- */
-void
-GNUNET_REVOCATION_pow_stop (struct GNUNET_REVOCATION_PowCalculationHandle *pc)
-{
-  GNUNET_free (pc);
-}
-
-
-size_t
-GNUNET_REVOCATION_proof_get_size (const struct GNUNET_REVOCATION_PowP *pow)
-{
-  size_t size;
-  size_t ksize;
-  const struct GNUNET_CRYPTO_PublicKey *pk;
-
-  size = sizeof (struct GNUNET_REVOCATION_PowP);
-  pk = (const struct GNUNET_CRYPTO_PublicKey *) &pow[1];
-  ksize = GNUNET_CRYPTO_public_key_get_length (pk);
-  size += ksize;
-  size += GNUNET_CRYPTO_signature_get_raw_length_by_type (pk->type);
-  return size;
-}
-
-
 /* end of revocation_api.c */
diff --git a/src/service/seti/Makefile.am b/src/service/seti/Makefile.am
index c2d31df9c..00923d56d 100644
--- a/src/service/seti/Makefile.am
+++ b/src/service/seti/Makefile.am
@@ -68,19 +68,5 @@ test_seti_api_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   libgnunetseti.la
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_seti_test.la
-
-libgnunet_plugin_block_seti_test_la_SOURCES = \
-  plugin_block_seti_test.c
-libgnunet_plugin_block_seti_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_seti_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 EXTRA_DIST = \
   test_seti.conf
diff --git a/src/service/seti/meson.build b/src/service/seti/meson.build
index 8538917d8..1743e327d 100644
--- a/src/service/seti/meson.build
+++ b/src/service/seti/meson.build
@@ -26,12 +26,6 @@ libgnunetseti = library('gnunetseti',
 pkg.generate(libgnunetseti, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set intersection service')
 libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
-shared_module('gnunet_plugin_block_seti_test',
-              ['plugin_block_seti_test.c'],
-              dependencies: libgnunetutil_dep,
-              include_directories: [incdir, configuration_inc],
-              install:true,
-              install_dir: get_option('libdir')/'gnunet')
 executable ('gnunet-service-seti',
             gnunetserviceseti_src,
             dependencies: [libgnunetseti_dep,
diff --git a/src/service/setu/Makefile.am b/src/service/setu/Makefile.am
index f7f8ed394..f0cf9fdbc 100644
--- a/src/service/setu/Makefile.am
+++ b/src/service/setu/Makefile.am
@@ -88,19 +88,5 @@ perf_setu_api_LDADD = \
   libgnunetsetu.la
 
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_setu_test.la
-
-libgnunet_plugin_block_setu_test_la_SOURCES = \
-  plugin_block_setu_test.c
-libgnunet_plugin_block_setu_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_setu_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 EXTRA_DIST = \
   test_setu.conf
diff --git a/src/service/setu/meson.build b/src/service/setu/meson.build
index 974f16274..ccfa5762b 100644
--- a/src/service/setu/meson.build
+++ b/src/service/setu/meson.build
@@ -28,12 +28,6 @@ libgnunetsetu = library('gnunetsetu',
 pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set union service')
 libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
-shared_module('gnunet_plugin_block_setu_test',
-              ['plugin_block_setu_test.c'],
-              dependencies: libgnunetutil_dep,
-              include_directories: [incdir, configuration_inc],
-              install:true,
-              install_dir: get_option('libdir')/'gnunet')
 executable ('gnunet-service-setu',
             gnunetservicesetu_src,
             dependencies: [libgnunetsetu_dep,
diff --git a/src/service/topology/gnunet-daemon-topology.c b/src/service/topology/gnunet-daemon-topology.c
index efabac0fc..71cc5bd19 100644
--- a/src/service/topology/gnunet-daemon-topology.c
+++ b/src/service/topology/gnunet-daemon-topology.c
@@ -641,35 +641,26 @@ consider_for_advertising (const struct GNUNET_MessageHeader *hello)
   int num_addresses_old;
   int num_addresses_new;
   struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (hello);
-  struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id (builder);
+  struct GNUNET_PeerIdentity pid;
   struct Peer *peer;
   uint16_t size;
 
   GNUNET_HELLO_builder_iterate (builder,
-                                pid,
+                                &pid,
                                 &address_iterator,
                                 &num_addresses_new);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "consider 0 for %s\n",
-              GNUNET_i2s (pid));
+              GNUNET_i2s (&pid));
   if (0 == num_addresses_new)
   {
     GNUNET_HELLO_builder_free (builder);
     return; /* no point in advertising this one... */
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "consider 1\n");
-  if (NULL == pid)
-  {
-    GNUNET_HELLO_builder_free (builder);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "consider 2\n");
-  peer = GNUNET_CONTAINER_multipeermap_get (peers, pid);
+  peer = GNUNET_CONTAINER_multipeermap_get (peers, &pid);
   if (NULL == peer)
   {
-    peer = make_peer (pid, hello);
+    peer = make_peer (&pid, hello);
   }
   else if (NULL != peer->hello)
   {
@@ -679,10 +670,10 @@ consider_for_advertising (const struct GNUNET_MessageHeader *hello)
     struct GNUNET_TIME_Absolute old_hello_exp =
       GNUNET_HELLO_builder_get_expiration_time (peer->hello);
     struct GNUNET_HELLO_Builder *builder_old = GNUNET_HELLO_builder_from_msg (peer->hello);
-    struct GNUNET_PeerIdentity *pid_old = GNUNET_HELLO_builder_get_id (builder_old);
+    struct GNUNET_PeerIdentity pid_old;
 
     GNUNET_HELLO_builder_iterate (builder_old,
-                                  pid_old,
+                                  &pid_old,
                                   &address_iterator,
                                   &num_addresses_old);
     if (GNUNET_TIME_absolute_cmp (new_hello_exp, >, now) &&
@@ -710,7 +701,7 @@ consider_for_advertising (const struct GNUNET_MessageHeader *hello)
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Found HELLO from peer `%s' for advertising\n",
-              GNUNET_i2s (pid));
+              GNUNET_i2s (&pid));
   if (NULL != peer->filter)
   {
     GNUNET_CONTAINER_bloomfilter_free (peer->filter);
@@ -828,7 +819,7 @@ check_hello (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (
     message);
-  struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id (builder);
+  const struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id (builder);
 
   if (NULL == pid)
   {
@@ -858,10 +849,8 @@ handle_hello (void *cls, const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_PEERSTORE_StoreHelloContext *shc;
   const struct GNUNET_PeerIdentity *other = cls;
-  struct Peer *peer;
   struct GNUNET_HELLO_Builder *builder = GNUNET_HELLO_builder_from_msg (
     message);
-  struct GNUNET_PeerIdentity *pid = GNUNET_HELLO_builder_get_id (builder);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received encrypted HELLO from peer `%s'",
@@ -871,6 +860,7 @@ handle_hello (void *cls, const struct GNUNET_MessageHeader *message)
                             1,
                             GNUNET_NO);
   GNUNET_HELLO_builder_from_msg (message);
+  // FIXME this is not working shc uninitialized
   shc = GNUNET_PEERSTORE_hello_add (ps, message, &shc_cont, shc);
   GNUNET_HELLO_builder_free (builder);
 }