BUILD: Move namestore to service

66 files changed, 193 insertions, 162 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d166fd788..208049b50 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  namestore \
   set \
   seti \
   setu \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 0235c0a1c..78ff8b07b 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -9,4 +9,5 @@ SUBDIRS = \
         datastore \
         dht \
         namecache \
+        namestore \
         cadet
diff --git a/src/cli/namestore/.gitignore b/src/cli/namestore/.gitignore
new file mode 100644
index 000000000..3c0282e8c
--- /dev/null
+++ b/src/cli/namestore/.gitignore
@@ -0,0 +1,6 @@
+gnunet-namestore
+gnunet-namestore-dbtool
+gnunet-namestore-zonefile
+gnunet-namestore-fcfsd
+gnunet-zoneimport
+
diff --git a/src/cli/namestore/Makefile.am b/src/cli/namestore/Makefile.am
new file mode 100644
index 000000000..86ab2f0f7
--- /dev/null
+++ b/src/cli/namestore/Makefile.am
@@ -0,0 +1,71 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+sqldir = $(prefix)/share/gnunet/sql/
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+
+bin_PROGRAMS = \
+ gnunet-namestore \
+ gnunet-namestore-dbtool \
+ gnunet-namestore-zonefile \
+ gnunet-zoneimport
+
+gnunet_namestore_zonefile_SOURCES = \
+ gnunet-namestore-zonefile.c
+gnunet_namestore_zonefile_LDADD = \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_zoneimport_SOURCES = \
+ gnunet-zoneimport.c
+gnunet_zoneimport_LDADD = \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_namestore_SOURCES = \
+ gnunet-namestore.c
+gnunet_namestore_LDADD = \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(GN_LIBINTL)
+
+gnunet_namestore_dbtool_SOURCES = \
+ gnunet-namestore-dbtool.c
+gnunet_namestore_dbtool_LDADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(GN_LIBINTL)
+
+
+
+check_SCRIPTS = \
+  test_namestore_put.sh \
+  test_namestore_put_stdin.sh \
+  test_namestore_lookup.sh \
+  test_namestore_delete.sh \
+  test_namestore_zonefile_import.sh
+
+EXTRA_DIST = \
+  test_hostkey \
+  example_zonefile \
+  $(check_SCRIPTS)
diff --git a/src/namestore/example_zonefile b/src/cli/namestore/example_zonefile
index 5e380ff90..5e380ff90 100644
--- a/src/namestore/example_zonefile
+++ b/src/cli/namestore/example_zonefile
diff --git a/src/namestore/gnunet-namestore-dbtool.c b/src/cli/namestore/gnunet-namestore-dbtool.c
index 835d7a228..835d7a228 100644
--- a/src/namestore/gnunet-namestore-dbtool.c
+++ b/src/cli/namestore/gnunet-namestore-dbtool.c
diff --git a/src/namestore/gnunet-namestore-zonefile.c b/src/cli/namestore/gnunet-namestore-zonefile.c
index dfd438e94..dfd438e94 100644
--- a/src/namestore/gnunet-namestore-zonefile.c
+++ b/src/cli/namestore/gnunet-namestore-zonefile.c
diff --git a/src/namestore/gnunet-namestore.c b/src/cli/namestore/gnunet-namestore.c
index baa036ac7..baa036ac7 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/cli/namestore/gnunet-namestore.c
diff --git a/src/namestore/gnunet-zoneimport.c b/src/cli/namestore/gnunet-zoneimport.c
index c7e0cf65f..c7e0cf65f 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/cli/namestore/gnunet-zoneimport.c
diff --git a/src/namestore/test_namestore_delete.sh b/src/cli/namestore/test_namestore_delete.sh
index b861a4bc0..b861a4bc0 100755
--- a/src/namestore/test_namestore_delete.sh
+++ b/src/cli/namestore/test_namestore_delete.sh
diff --git a/src/namestore/test_namestore_lookup.sh b/src/cli/namestore/test_namestore_lookup.sh
index 1c96e102a..1c96e102a 100755
--- a/src/namestore/test_namestore_lookup.sh
+++ b/src/cli/namestore/test_namestore_lookup.sh
diff --git a/src/namestore/test_namestore_put.sh b/src/cli/namestore/test_namestore_put.sh
index eaf7d44b4..eaf7d44b4 100755
--- a/src/namestore/test_namestore_put.sh
+++ b/src/cli/namestore/test_namestore_put.sh
diff --git a/src/namestore/test_namestore_put_multiple.sh b/src/cli/namestore/test_namestore_put_multiple.sh
index 4c7340440..4c7340440 100755
--- a/src/namestore/test_namestore_put_multiple.sh
+++ b/src/cli/namestore/test_namestore_put_multiple.sh
diff --git a/src/namestore/test_namestore_put_stdin.sh b/src/cli/namestore/test_namestore_put_stdin.sh
index deb7bc4cb..deb7bc4cb 100755
--- a/src/namestore/test_namestore_put_stdin.sh
+++ b/src/cli/namestore/test_namestore_put_stdin.sh
diff --git a/src/namestore/test_namestore_zonefile_import.sh b/src/cli/namestore/test_namestore_zonefile_import.sh
index d6345257f..d6345257f 100755
--- a/src/namestore/test_namestore_zonefile_import.sh
+++ b/src/cli/namestore/test_namestore_zonefile_import.sh
diff --git a/src/contrib/service/abd/Makefile.am b/src/contrib/service/abd/Makefile.am
index 6eff980f4..d08a6a4a7 100644
--- a/src/contrib/service/abd/Makefile.am
+++ b/src/contrib/service/abd/Makefile.am
@@ -44,7 +44,7 @@ gnunet_abd_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
         $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(GN_LIBINTL)
 
 
@@ -66,7 +66,7 @@ gnunet_service_abd_LDADD = \
         libgnunetabd.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
         $(top_builddir)/src/gns/libgnunetgns.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
diff --git a/src/conversation/Makefile.am b/src/conversation/Makefile.am
index 4fca1ee79..720d543ca 100644
--- a/src/conversation/Makefile.am
+++ b/src/conversation/Makefile.am
@@ -71,7 +71,7 @@ libgnunetconversation_la_SOURCES = \
 libgnunetconversation_la_LIBADD = \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -198,7 +198,7 @@ gnunet_conversation_LDADD = \
   libgnunetconversation.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(INTLLIBS)
@@ -223,7 +223,7 @@ test_conversation_api_LDADD = \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -237,7 +237,7 @@ test_conversation_api_twocalls_LDADD = \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -251,7 +251,7 @@ test_conversation_api_reject_LDADD = \
   libgnunetspeaker.la \
   libgnunetmicrophone.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 379d6697a..08d85c903 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -186,7 +186,7 @@ test_gns_proxy_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 #  gnunet-gns-import.c
 #gnunet_gns_import_LDADD = \
 #  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-#  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+#  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
 #  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
 #  $(top_builddir)/src/lib/util/libgnunetutil.la \
 #  $(GN_LIBINTL)
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 2939d3379..62036f206 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -2,4 +2,5 @@ SUBDIRS = \
         block \
         gnsrecord \
         dhtu \
-        namecache
+        namecache \
+        namestore
diff --git a/src/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
index 685829cc2..3c8e9d170 100644
--- a/src/namestore/Makefile.am
+++ b/src/plugin/namestore/Makefile.am
@@ -13,9 +13,6 @@ sql_DATA = \
   namestore-0001.sql \
   namestore-drop.sql
 
-pkgcfg_DATA = \
-   namestore.conf
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
   XLIBS = -lgcov
@@ -81,23 +78,6 @@ endif
 
 REST_PLUGIN = libgnunet_plugin_rest_namestore.la
 
-lib_LTLIBRARIES = \
-  libgnunetnamestore.la
-
-
-libexec_PROGRAMS = \
- gnunet-service-namestore
-
-bin_PROGRAMS = \
- gnunet-namestore \
- gnunet-namestore-dbtool \
- gnunet-namestore-zonefile \
- gnunet-zoneimport
-
-libexec_PROGRAMS += \
- gnunet-namestore-fcfsd
-
-
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
   $(POSTGRES_PLUGIN) \
@@ -107,7 +87,7 @@ plugin_LTLIBRARIES = \
 libgnunet_plugin_rest_namestore_la_SOURCES = \
   plugin_rest_namestore.c
 libgnunet_plugin_rest_namestore_la_LIBADD = \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/json/libgnunetjson.la \
@@ -120,82 +100,6 @@ libgnunet_plugin_rest_namestore_la_LDFLAGS = \
 libgnunet_plugin_rest_namestore_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
 
 
-libgnunetnamestore_la_SOURCES = \
-  namestore_api.c \
-  namestore_api_monitor.c \
-  namestore.h
-libgnunetnamestore_la_LIBADD = \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-libgnunetnamestore_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  \
-  -version-info 0:1:0
-
-gnunet_namestore_zonefile_SOURCES = \
- gnunet-namestore-zonefile.c
-gnunet_namestore_zonefile_LDADD = \
-  libgnunetnamestore.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_zoneimport_SOURCES = \
- gnunet-zoneimport.c
-gnunet_zoneimport_LDADD = \
-  libgnunetnamestore.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_namestore_SOURCES = \
- gnunet-namestore.c
-gnunet_namestore_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-gnunet_namestore_dbtool_SOURCES = \
- gnunet-namestore-dbtool.c
-gnunet_namestore_dbtool_LDADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-
-
-gnunet_namestore_fcfsd_SOURCES = \
- gnunet-namestore-fcfsd.c
-gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/json/libgnunetjson.la \
-  $(GN_LIBINTL) -ljansson
-gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
-
-
-gnunet_service_namestore_SOURCES = \
- gnunet-service-namestore.c
-gnunet_service_namestore_LDADD = \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la \
-  $(GN_LIBINTL)
-
-
-
 libgnunet_plugin_namestore_sqlite_la_SOURCES = \
   plugin_namestore_sqlite.c
 libgnunet_plugin_namestore_sqlite_la_LIBADD = \
@@ -227,7 +131,7 @@ test_namestore_api_store_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_store_postgres_SOURCES = \
  test_namestore_api_store.c
@@ -236,7 +140,7 @@ test_namestore_api_store_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_store_update_sqlite_SOURCES = \
  test_namestore_api_store_update.c
@@ -246,7 +150,7 @@ test_namestore_api_store_update_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_store_update_postgres_SOURCES = \
  test_namestore_api_store_update.c
@@ -256,7 +160,7 @@ test_namestore_api_store_update_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_sqlite_SOURCES = \
  test_namestore_api_lookup_nick.c
@@ -266,7 +170,7 @@ test_namestore_api_lookup_nick_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_lookup_nick_postgres_SOURCES = \
  test_namestore_api_lookup_nick.c
@@ -276,7 +180,7 @@ test_namestore_api_lookup_nick_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_sqlite_SOURCES = \
  test_namestore_api_remove.c
@@ -285,7 +189,7 @@ test_namestore_api_remove_sqlite_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_postgres_SOURCES = \
  test_namestore_api_remove.c
@@ -294,7 +198,7 @@ test_namestore_api_remove_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
@@ -303,7 +207,7 @@ test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
  test_namestore_api_remove_not_existing_record.c
@@ -312,7 +216,7 @@ test_namestore_api_remove_not_existing_record_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_to_name_sqlite_SOURCES = \
  test_namestore_api_zone_to_name.c
@@ -320,7 +224,7 @@ test_namestore_api_zone_to_name_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_to_name_postgres_SOURCES = \
  test_namestore_api_zone_to_name.c
@@ -328,14 +232,14 @@ test_namestore_api_zone_to_name_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_monitoring_sqlite_SOURCES = \
  test_namestore_api_monitoring.c
 test_namestore_api_monitoring_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -344,7 +248,7 @@ test_namestore_api_monitoring_postgres_SOURCES = \
 test_namestore_api_monitoring_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -353,7 +257,7 @@ test_namestore_api_monitoring_existing_sqlite_SOURCES = \
 test_namestore_api_monitoring_existing_sqlite_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -361,7 +265,7 @@ test_namestore_api_monitoring_existing_postgres_SOURCES = \
  test_namestore_api_monitoring_existing.c
 test_namestore_api_monitoring_existing_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
@@ -371,7 +275,7 @@ test_namestore_api_tx_rollback_sqlite_SOURCES = \
 test_namestore_api_tx_rollback_sqlite_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -380,7 +284,7 @@ test_namestore_api_tx_rollback_postgres_SOURCES = \
 test_namestore_api_tx_rollback_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -390,7 +294,7 @@ test_namestore_api_edit_records_postgres_SOURCES = \
 test_namestore_api_edit_records_postgres_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 endif
@@ -402,7 +306,7 @@ test_namestore_api_zone_iteration_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_postgres_SOURCES = \
  test_namestore_api_zone_iteration.c
@@ -411,7 +315,7 @@ test_namestore_api_zone_iteration_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 perf_namestore_api_zone_iteration_postgres_SOURCES = \
  perf_namestore_api_zone_iteration.c
@@ -420,7 +324,7 @@ perf_namestore_api_zone_iteration_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 perf_namestore_api_import_sqlite_SOURCES = \
  perf_namestore_api_import.c
@@ -429,7 +333,7 @@ perf_namestore_api_import_sqlite_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 perf_namestore_api_import_postgres_SOURCES = \
  perf_namestore_api_import.c
@@ -438,7 +342,7 @@ perf_namestore_api_import_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 
 perf_namestore_api_zone_iteration_sqlite_SOURCES = \
@@ -448,7 +352,7 @@ perf_namestore_api_zone_iteration_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
@@ -457,7 +361,7 @@ test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
  test_namestore_api_zone_iteration_nick.c
@@ -466,7 +370,7 @@ test_namestore_api_zone_iteration_nick_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_specific_zone.c
@@ -475,7 +379,7 @@ test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
  test_namestore_api_zone_iteration_specific_zone.c
@@ -484,7 +388,7 @@ test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
@@ -493,7 +397,7 @@ test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
  test_namestore_api_zone_iteration_stop.c
@@ -502,7 +406,7 @@ test_namestore_api_zone_iteration_stop_postgres_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  libgnunetnamestore.la
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
 
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c
@@ -519,13 +423,6 @@ test_plugin_namestore_postgres_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 check_SCRIPTS = \
-  test_namestore_put.sh \
-  test_namestore_put_stdin.sh \
-  test_namestore_lookup.sh \
-  test_namestore_delete.sh \
-  test_namestore_zonefile_import.sh
-
-check_SCRIPTS += \
   test_plugin_rest_namestore.sh
 
 EXTRA_DIST = \
@@ -538,6 +435,5 @@ EXTRA_DIST = \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
   test_hostkey \
-  example_zonefile \
   $(check_SCRIPTS) \
   $(sql_DATA)
diff --git a/src/namestore/namestore-0001.sql b/src/plugin/namestore/namestore-0001.sql
index bdfb31976..bdfb31976 100644
--- a/src/namestore/namestore-0001.sql
+++ b/src/plugin/namestore/namestore-0001.sql
diff --git a/src/namestore/namestore-drop.sql b/src/plugin/namestore/namestore-drop.sql
index 231417af8..231417af8 100644
--- a/src/namestore/namestore-drop.sql
+++ b/src/plugin/namestore/namestore-drop.sql
diff --git a/src/namestore/perf_namestore_api_import.c b/src/plugin/namestore/perf_namestore_api_import.c
index e56fb961c..e56fb961c 100644
--- a/src/namestore/perf_namestore_api_import.c
+++ b/src/plugin/namestore/perf_namestore_api_import.c
diff --git a/src/namestore/perf_namestore_api_postgres.conf b/src/plugin/namestore/perf_namestore_api_postgres.conf
index 5e02c2df3..5e02c2df3 100644
--- a/src/namestore/perf_namestore_api_postgres.conf
+++ b/src/plugin/namestore/perf_namestore_api_postgres.conf
diff --git a/src/namestore/perf_namestore_api_sqlite.conf b/src/plugin/namestore/perf_namestore_api_sqlite.conf
index 55c3dc812..55c3dc812 100644
--- a/src/namestore/perf_namestore_api_sqlite.conf
+++ b/src/plugin/namestore/perf_namestore_api_sqlite.conf
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/plugin/namestore/perf_namestore_api_zone_iteration.c
index e16748f5b..e16748f5b 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/plugin/namestore/perf_namestore_api_zone_iteration.c
diff --git a/src/namestore/plugin_namestore_flat.c b/src/plugin/namestore/plugin_namestore_flat.c
index 8b574d2cf..716071ff3 100644
--- a/src/namestore/plugin_namestore_flat.c
+++ b/src/plugin/namestore/plugin_namestore_flat.c
@@ -28,7 +28,6 @@
 #include "gnunet_namestore_plugin.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
-#include "namestore.h"
 
 /**
  * Context for all functions in this plugin.
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/plugin/namestore/plugin_namestore_postgres.c
index c6debf3a9..1dc526dc2 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/plugin/namestore/plugin_namestore_postgres.c
@@ -28,7 +28,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_pq_lib.h"
-#include "namestore.h"
 
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "namestore-postgres", __VA_ARGS__)
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/plugin/namestore/plugin_namestore_sqlite.c
index d66271ffa..ada9ca25b 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/plugin/namestore/plugin_namestore_sqlite.c
@@ -29,7 +29,6 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_gnsrecord_lib.h"
 #include "gnunet_sq_lib.h"
-#include "namestore.h"
 #include <sqlite3.h>
 
 /**
diff --git a/src/namestore/plugin_rest_namestore.c b/src/plugin/namestore/plugin_rest_namestore.c
index 31e78e6dd..31e78e6dd 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/plugin/namestore/plugin_rest_namestore.c
diff --git a/src/namestore/test_common.c b/src/plugin/namestore/test_common.c
index 4df24a7f7..4df24a7f7 100644
--- a/src/namestore/test_common.c
+++ b/src/plugin/namestore/test_common.c
diff --git a/src/namestore/test_hostkey b/src/plugin/namestore/test_hostkey
index e69de29bb..e69de29bb 100644
--- a/src/namestore/test_hostkey
+++ b/src/plugin/namestore/test_hostkey
diff --git a/src/namestore/test_namestore_api.conf b/src/plugin/namestore/test_namestore_api.conf
index 1648c7cae..1648c7cae 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/plugin/namestore/test_namestore_api.conf
diff --git a/src/namestore/test_namestore_api_edit_records.c b/src/plugin/namestore/test_namestore_api_edit_records.c
index a6bce7c17..a6bce7c17 100644
--- a/src/namestore/test_namestore_api_edit_records.c
+++ b/src/plugin/namestore/test_namestore_api_edit_records.c
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/plugin/namestore/test_namestore_api_lookup_nick.c
index 21fc1ef79..21fc1ef79 100644
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/plugin/namestore/test_namestore_api_lookup_nick.c
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/plugin/namestore/test_namestore_api_monitoring.c
index 74dad3749..74dad3749 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/plugin/namestore/test_namestore_api_monitoring.c
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/plugin/namestore/test_namestore_api_monitoring_existing.c
index fe17833c8..fe17833c8 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/plugin/namestore/test_namestore_api_monitoring_existing.c
diff --git a/src/namestore/test_namestore_api_postgres.conf b/src/plugin/namestore/test_namestore_api_postgres.conf
index 007168280..007168280 100644
--- a/src/namestore/test_namestore_api_postgres.conf
+++ b/src/plugin/namestore/test_namestore_api_postgres.conf
diff --git a/src/namestore/test_namestore_api_remove.c b/src/plugin/namestore/test_namestore_api_remove.c
index 1a4a7c867..1a4a7c867 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/plugin/namestore/test_namestore_api_remove.c
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/plugin/namestore/test_namestore_api_remove_not_existing_record.c
index 11a69bea1..11a69bea1 100644
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/plugin/namestore/test_namestore_api_remove_not_existing_record.c
diff --git a/src/namestore/test_namestore_api_sqlite.conf b/src/plugin/namestore/test_namestore_api_sqlite.conf
index 342356247..342356247 100644
--- a/src/namestore/test_namestore_api_sqlite.conf
+++ b/src/plugin/namestore/test_namestore_api_sqlite.conf
diff --git a/src/namestore/test_namestore_api_store.c b/src/plugin/namestore/test_namestore_api_store.c
index 22b92fbe5..22b92fbe5 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/plugin/namestore/test_namestore_api_store.c
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/plugin/namestore/test_namestore_api_store_update.c
index 86495e261..86495e261 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/plugin/namestore/test_namestore_api_store_update.c
diff --git a/src/namestore/test_namestore_api_tx_rollback.c b/src/plugin/namestore/test_namestore_api_tx_rollback.c
index 4a701f60e..4a701f60e 100644
--- a/src/namestore/test_namestore_api_tx_rollback.c
+++ b/src/plugin/namestore/test_namestore_api_tx_rollback.c
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/plugin/namestore/test_namestore_api_zone_iteration.c
index fb69fffcc..fb69fffcc 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/plugin/namestore/test_namestore_api_zone_iteration.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
index c494051d0..c494051d0 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 02587706c..02587706c 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
index b6b0787ef..b6b0787ef 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/plugin/namestore/test_namestore_api_zone_to_name.c
index c70eef53a..c70eef53a 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/plugin/namestore/test_namestore_api_zone_to_name.c
diff --git a/src/namestore/test_plugin_namestore.c b/src/plugin/namestore/test_plugin_namestore.c
index 388b23f57..388b23f57 100644
--- a/src/namestore/test_plugin_namestore.c
+++ b/src/plugin/namestore/test_plugin_namestore.c
diff --git a/src/namestore/test_plugin_namestore_postgres.conf b/src/plugin/namestore/test_plugin_namestore_postgres.conf
index 140d54623..140d54623 100644
--- a/src/namestore/test_plugin_namestore_postgres.conf
+++ b/src/plugin/namestore/test_plugin_namestore_postgres.conf
diff --git a/src/namestore/test_plugin_namestore_sqlite.conf b/src/plugin/namestore/test_plugin_namestore_sqlite.conf
index 365198db2..365198db2 100644
--- a/src/namestore/test_plugin_namestore_sqlite.conf
+++ b/src/plugin/namestore/test_plugin_namestore_sqlite.conf
diff --git a/src/namestore/test_plugin_rest_namestore.sh b/src/plugin/namestore/test_plugin_rest_namestore.sh
index 4f117db8b..4f117db8b 100755
--- a/src/namestore/test_plugin_rest_namestore.sh
+++ b/src/plugin/namestore/test_plugin_rest_namestore.sh
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 567cbb6d7..5ecaaa10c 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -53,7 +53,7 @@ EXTRA_DIST = \
 test_gns_vpn_SOURCES = \
  test_gns_vpn.c
 test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/service/identity/libgnunetidentity.la \
  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index c052dd2a8..406aad081 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -63,7 +63,7 @@ libgnunet_plugin_rest_reclaim_la_LIBADD = \
   $(top_builddir)/src/lib/json/libgnunetjson.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson $(MHD_LIBS)
 libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
@@ -79,7 +79,7 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   libgnunetreclaim.la \
   $(top_builddir)/src/service/rest/libgnunetrest.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
@@ -123,7 +123,7 @@ gnunet_service_reclaim_LDADD = \
  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
  $(top_builddir)/src/service/identity/libgnunetidentity.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
  libgnunetreclaim.la \
  $(top_builddir)/src/gns/libgnunetgns.la \
@@ -154,7 +154,7 @@ libgnunetdid_la_LIBADD = \
         $(top_builddir)/src/gns/libgnunetgns.la \
         $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
         $(top_builddir)/src/service/identity/libgnunetidentity.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
         -ljansson \
   $(GN_LIBINTL) $(XLIB)
 libgnunetdid_la_LDFLAGS = \
@@ -200,7 +200,7 @@ gnunet_reclaim_SOURCES = \
  gnunet-reclaim.c
 gnunet_reclaim_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   libgnunetreclaim.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(GN_LIBINTL)
@@ -219,7 +219,7 @@ gnunet_did_LDADD = \
         $(top_builddir)/src/gns/libgnunetgns.la \
         $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
         $(top_builddir)/src/service/identity/libgnunetidentity.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   libgnunetdid.la \
         -ljansson
 
@@ -231,7 +231,7 @@ test_did_helper_LDADD = \
         $(top_builddir)/src/gns/libgnunetgns.la \
         $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
         $(top_builddir)/src/service/identity/libgnunetidentity.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   libgnunetdid.la \
   -ljansson
 
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 02148d0c7..636caa985 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -18,5 +18,6 @@ SUBDIRS = \
         datastore \
         dht \
   namecache \
+  namestore \
   regex \
         cadet
diff --git a/src/namestore/.gitignore b/src/service/namestore/.gitignore
index 2265f9815..7b99c6163 100644
--- a/src/namestore/.gitignore
+++ b/src/service/namestore/.gitignore
@@ -1,7 +1,4 @@
 gnunet-service-namestore
-gnunet-namestore
-gnunet-namestore-dbtool
-gnunet-namestore-zonefile
 gnunet-namestore-fcfsd
 test_namestore_api_lookup_nick.nc
 test_namestore_api_lookup_private.nc
@@ -20,7 +17,6 @@ test_namestore_api_zone_iteration_specific_zone.nc
 test_namestore_api_zone_iteration_stop.nc
 test_plugin_namestore_postgres
 test_plugin_namestore_sqlite
-gnunet-zoneimport
 test_namestore_api_lookup_nick_postgres
 test_namestore_api_lookup_nick_sqlite
 test_namestore_api_lookup_private_postgres
diff --git a/src/service/namestore/Makefile.am b/src/service/namestore/Makefile.am
new file mode 100644
index 000000000..7f49e680f
--- /dev/null
+++ b/src/service/namestore/Makefile.am
@@ -0,0 +1,63 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include $(POSTGRESQL_CPPFLAGS)
+
+plugindir = $(libdir)/gnunet
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+   namestore.conf
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIBS = -lgcov
+endif
+
+lib_LTLIBRARIES = \
+  libgnunetnamestore.la
+
+libexec_PROGRAMS = \
+ gnunet-service-namestore
+
+libexec_PROGRAMS += \
+ gnunet-namestore-fcfsd
+
+
+libgnunetnamestore_la_SOURCES = \
+  namestore_api.c \
+  namestore_api_monitor.c \
+  namestore.h
+libgnunetnamestore_la_LIBADD = \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la  \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+libgnunetnamestore_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)  \
+  -version-info 0:1:0
+
+gnunet_namestore_fcfsd_SOURCES = \
+ gnunet-namestore-fcfsd.c
+gnunet_namestore_fcfsd_LDADD = $(MHD_LIBS) \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  libgnunetnamestore.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/json/libgnunetjson.la \
+  $(GN_LIBINTL) -ljansson
+gnunet_namestore_fcfsd_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
+
+
+gnunet_service_namestore_SOURCES = \
+ gnunet-service-namestore.c
+gnunet_service_namestore_LDADD = \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  libgnunetnamestore.la \
+  $(GN_LIBINTL)
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/service/namestore/gnunet-namestore-fcfsd.c
index 4948ae441..4948ae441 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/service/namestore/gnunet-namestore-fcfsd.c
diff --git a/src/namestore/gnunet-service-namestore.c b/src/service/namestore/gnunet-service-namestore.c
index 26de295bf..26de295bf 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/service/namestore/gnunet-service-namestore.c
diff --git a/src/namestore/meson.build b/src/service/namestore/meson.build
index fd7cfe553..fd7cfe553 100644
--- a/src/namestore/meson.build
+++ b/src/service/namestore/meson.build
diff --git a/src/namestore/namestore.conf.in b/src/service/namestore/namestore.conf.in
index d817f3f95..d817f3f95 100644
--- a/src/namestore/namestore.conf.in
+++ b/src/service/namestore/namestore.conf.in
diff --git a/src/namestore/namestore.h b/src/service/namestore/namestore.h
index 35d54d317..35d54d317 100644
--- a/src/namestore/namestore.h
+++ b/src/service/namestore/namestore.h
diff --git a/src/namestore/namestore_api.c b/src/service/namestore/namestore_api.c
index 7a4438e30..7a4438e30 100644
--- a/src/namestore/namestore_api.c
+++ b/src/service/namestore/namestore_api.c
diff --git a/src/namestore/namestore_api_monitor.c b/src/service/namestore/namestore_api_monitor.c
index ec4ba879b..ec4ba879b 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/service/namestore/namestore_api_monitor.c
diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index 8f4e74588..5a96afa83 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -26,7 +26,7 @@ gnunet_service_zonemaster_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la  \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
   $(GN_LIBINTL) \
   -lpthread