BUILD: Move fs to contrib/service

111 files changed, 156 insertions, 610 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d1607b6b..3631ff970 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,6 @@ SUBDIRS = \
         rest-plugin \
         cli \
         contrib \
-  fs \
   exit \
   pt \
   reclaim \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index e968c0bce..950aab622 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -13,4 +13,5 @@ SUBDIRS = \
         revocation \
         vpn \
         gns \
+        fs \
         cadet
diff --git a/src/cli/fs/.gitignore b/src/cli/fs/.gitignore
new file mode 100644
index 000000000..3ca8908d0
--- /dev/null
+++ b/src/cli/fs/.gitignore
@@ -0,0 +1,8 @@
+gnunet-unindex
+gnunet-auto-share
+gnunet-directory
+gnunet-download
+gnunet-fs
+gnunet-publish
+gnunet-search
+
diff --git a/src/cli/fs/Makefile.am b/src/cli/fs/Makefile.am
new file mode 100644
index 000000000..0d489dbe6
--- /dev/null
+++ b/src/cli/fs/Makefile.am
@@ -0,0 +1,107 @@
+# 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/
+
+bin_PROGRAMS = \
+  gnunet-auto-share \
+  gnunet-directory \
+  gnunet-download \
+  gnunet-publish \
+  gnunet-search \
+  gnunet-fs \
+  gnunet-unindex
+
+gnunet_directory_SOURCES = \
+ gnunet-directory.c
+gnunet_directory_LDADD = \
+  $(top_builddir)/src/service/fs/libgnunetfs.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_directory_LDADD += \
+  -lextractor
+endif
+
+gnunet_fs_SOURCES = \
+ gnunet-fs.c
+gnunet_fs_LDADD = \
+  $(top_builddir)/src/service/fs/libgnunetfs.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_fs_LDADD += \
+  -lextractor
+endif
+
+gnunet_download_SOURCES =  \
+ gnunet-download.c
+gnunet_download_LDADD =  \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+gnunet_publish_SOURCES =  \
+ gnunet-publish.c
+gnunet_publish_LDADD =  \
+ $(top_builddir)/src/service/identity/libgnunetidentity.la \
+ $(top_builddir)/src/service/fs/libgnunetfs.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_publish_LDADD += \
+  -lextractor
+endif
+
+gnunet_auto_share_SOURCES =  \
+ gnunet-auto-share.c
+gnunet_auto_share_LDADD =  \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_auto_share_LDADD += \
+  -lextractor
+endif
+
+gnunet_helper_fs_publish_SOURCES =  \
+ gnunet-helper-fs-publish.c
+gnunet_helper_fs_publish_LDADD =  \
+  $(top_builddir)/src/service/fs/libgnunetfs.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_helper_fs_publish_LDADD += \
+  -lextractor
+endif
+
+gnunet_search_SOURCES = \
+ gnunet-search.c
+gnunet_search_LDADD = \
+  $(top_builddir)/src/service/fs/libgnunetfs.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+if HAVE_LIBEXTRACTOR
+gnunet_search_LDADD += \
+  -lextractor
+endif
+
+
+gnunet_unindex_SOURCES = \
+ gnunet-unindex.c
+gnunet_unindex_LDADD = \
+  $(top_builddir)/src/service/fs/libgnunetfs.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
diff --git a/src/fs/gnunet-auto-share.c b/src/cli/fs/gnunet-auto-share.c
index f91e9d00d..f91e9d00d 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/cli/fs/gnunet-auto-share.c
diff --git a/src/fs/gnunet-directory.c b/src/cli/fs/gnunet-directory.c
index ab9f2905a..ab9f2905a 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/cli/fs/gnunet-directory.c
diff --git a/src/fs/gnunet-download.c b/src/cli/fs/gnunet-download.c
index 4694077e9..4694077e9 100644
--- a/src/fs/gnunet-download.c
+++ b/src/cli/fs/gnunet-download.c
diff --git a/src/fs/gnunet-fs.c b/src/cli/fs/gnunet-fs.c
index 21e3c4a40..21e3c4a40 100644
--- a/src/fs/gnunet-fs.c
+++ b/src/cli/fs/gnunet-fs.c
diff --git a/src/fs/gnunet-publish.c b/src/cli/fs/gnunet-publish.c
index 7a87130de..7a87130de 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/cli/fs/gnunet-publish.c
diff --git a/src/fs/gnunet-search.c b/src/cli/fs/gnunet-search.c
index a72cf97cc..a72cf97cc 100644
--- a/src/fs/gnunet-search.c
+++ b/src/cli/fs/gnunet-search.c
diff --git a/src/fs/gnunet-unindex.c b/src/cli/fs/gnunet-unindex.c
index 326f75a63..326f75a63 100644
--- a/src/fs/gnunet-unindex.c
+++ b/src/cli/fs/gnunet-unindex.c
diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
deleted file mode 100755
index 564dd68f2..000000000
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ /dev/null
@@ -1,113 +0,0 @@
-#!@PYTHONEXE@
-#    This file is part of GNUnet.
-#    (C) 2010 Christian Grothoff (and other contributing authors)
-#
-#    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
-#
-# Testcase for file-sharing command-line tools (indexing and unindexing)
-import sys
-import os
-import subprocess
-import re
-import shutil
-
-srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
-if gnunet_pyexpect_dir not in sys.path:
-    sys.path.append(gnunet_pyexpect_dir)
-
-from gnunet_pyexpect import pexpect
-
-if os.name == 'posix':
-    download = './gnunet-download'
-    gnunetarm = 'gnunet-arm'
-    publish = './gnunet-publish'
-    unindex = './gnunet-unindex'
-elif os.name == 'nt':
-    download = './gnunet-download.exe'
-    gnunetarm = 'gnunet-arm.exe'
-    publish = './gnunet-publish.exe'
-    unindex = './gnunet-unindex.exe'
-
-if os.name == "nt":
-    shutil.rmtree(
-        os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True
-    )
-else:
-    shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True)
-
-arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_fs_idx_data.conf'])
-arm.communicate()
-
-try:
-    pub = pexpect()
-
-    pub.spawn(
-        None, [
-            publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m',
-            "description:Test archive", '-k', 'tst',
-            'test_gnunet_fs_rec_data.tgz'
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"
-        )
-    )
-
-    down = pexpect()
-    down.spawn(
-        None, [
-            download, '-c', 'test_gnunet_fs_idx_data.conf', '-o',
-            'test_gnunet_fs_rec_data.tar.gz',
-            'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    down.expect(
-        "stdout",
-        re.compile(
-            r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"
-        )
-    )
-    os.remove("test_gnunet_fs_rec_data.tar.gz")
-
-    un = pexpect()
-    un.spawn(
-        None, [
-            unindex, '-c', 'test_gnunet_fs_idx_data.conf',
-            'test_gnunet_fs_rec_data.tgz'
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    un.expect("stdout", re.compile(r'Unindexing done\.\r?\n'))
-
-finally:
-    arm = subprocess.Popen([
-        gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf'
-    ])
-    arm.communicate()
-    if os.name == "nt":
-        shutil.rmtree(
-            os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True
-        )
-    else:
-        shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True)
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
deleted file mode 100644
index ba2a872dd..000000000
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ test_fs_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-py-idx/
-
-[transport]
-PLUGINS = 
-
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
deleted file mode 100755
index a25e4eaef..000000000
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ /dev/null
@@ -1,149 +0,0 @@
-#!@PYTHONEXE@
-#    This file is part of GNUnet.
-#    (C) 2010, 2018 Christian Grothoff (and other contributing authors)
-#
-#    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
-#
-# Testcase for file-sharing command-line tools (publish, search, download)
-
-import sys
-import os
-import subprocess
-import re
-import shutil
-try:
-    # Python 2.7
-    reload
-except NameError:
-    try:
-        # Python 3.4+:
-        from importlib import reload
-    except ImportError:
-        # Python 3.0 - 3.3
-        from imp import reload
-
-reload(sys)
-
-# Force encoding to utf-8, as this test otherwise fails
-# on some systems (see #5094). In Python 3+ there is no attribute
-# sys.setdefaultencoding anymore.
-if (3 < sys.version_info[0]):
-    sys.setdefaultencoding('utf8')
-
-srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
-if gnunet_pyexpect_dir not in sys.path:
-    sys.path.append(gnunet_pyexpect_dir)
-
-from gnunet_pyexpect import pexpect
-
-if os.name == 'posix':
-    download = './gnunet-download'
-    gnunetarm = 'gnunet-arm'
-    publish = './gnunet-publish'
-    unindex = './gnunet-unindex'
-    search = './gnunet-search'
-elif os.name == 'nt':
-    download = './gnunet-download.exe'
-    gnunetarm = 'gnunet-arm.exe'
-    publish = './gnunet-publish.exe'
-    unindex = './gnunet-unindex.exe'
-    search = './gnunet-search.exe'
-
-if "GNUNET_PREFIX" in os.environ:
-    pass
-else:
-    print("You need to export GNUNET_PREFIX")
-    sys.exit(1)
-
-if os.name == "nt":
-    shutil.rmtree(
-        os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True
-    )
-else:
-    shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True)
-
-arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_fs_psd_data.conf'])
-arm.communicate()
-
-# first, basic publish-search-download run
-try:
-    pub = pexpect()
-    pub.spawn(
-        None, [
-            publish, '-c', 'test_gnunet_fs_psd_data.conf', '-n', '-m',
-            "description:Test archive", '-k', 'tst',
-            'test_gnunet_fs_rec_data.tgz'
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    pub.expect(
-        "stdout",
-        re.compile(r"Publishing `.+test_gnunet_fs_rec_data.tgz' done\.\r?\n")
-    )
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"
-        )
-    )
-
-    s = pexpect()
-    s.spawn(
-        None, [
-            search, '-V', '-t', '1000 ms', '-N', '1', '-c',
-            'test_gnunet_fs_psd_data.conf', 'tst'
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    s.expect(
-        "stdout",
-        re.compile(
-            r'gnunet-download -o "test_gnunet_fs_rec_data.tgz" gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822\r?\n'
-        )
-    )
-
-    down = pexpect()
-    down.spawn(
-        None, [
-            download, '-c', 'test_gnunet_fs_psd_data.conf', '-o',
-            'test_gnunet_fs_rec_data.tar.gz',
-            'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    down.expect(
-        "stdout",
-        re.compile(
-            r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"
-        )
-    )
-    os.remove("test_gnunet_fs_rec_data.tar.gz")
-
-finally:
-    arm = subprocess.Popen([
-        gnunetarm, '-eq', '-c', 'test_gnunet_fs_psd_data.conf'
-    ])
-    arm.communicate()
-    if os.name == "nt":
-        shutil.rmtree(
-            os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-psd"), True
-        )
-    else:
-        shutil.rmtree("/tmp/gnunet-test-fs-py-psd", True)
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
deleted file mode 100644
index f6c05ecdd..000000000
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ test_fs_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-py-psd/
-
-[transport]
-PLUGINS = 
-
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
deleted file mode 100755
index f7e84e3da..000000000
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ /dev/null
@@ -1,171 +0,0 @@
-#!@PYTHONEXE@
-#    This file is part of GNUnet.
-#    (C) 2010 Christian Grothoff (and other contributing authors)
-#
-#    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
-#
-# Testcase for file-sharing command-line tools (recursive publishing & download)
-import sys
-import os
-import subprocess
-import re
-import shutil
-import tarfile
-import filecmp
-
-srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
-if gnunet_pyexpect_dir not in sys.path:
-    sys.path.append(gnunet_pyexpect_dir)
-
-from gnunet_pyexpect import pexpect
-from pydiffer import dcdiff
-
-if os.name == 'posix':
-    download = './gnunet-download'
-    gnunetarm = 'gnunet-arm'
-    publish = './gnunet-publish'
-    unindex = './gnunet-unindex'
-    search = './gnunet-search'
-    directory = './gnunet-directory'
-elif os.name == 'nt':
-    download = './gnunet-download.exe'
-    gnunetarm = 'gnunet-arm.exe'
-    publish = './gnunet-publish.exe'
-    unindex = './gnunet-unindex.exe'
-    search = './gnunet-search.exe'
-    directory = './gnunet-directory.exe'
-
-if os.name == "nt":
-    shutil.rmtree(
-        os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True
-    )
-else:
-    shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True)
-
-arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_fs_rec_data.conf'])
-arm.communicate()
-
-tar = tarfile.open('test_gnunet_fs_rec_data.tgz')
-tar.extractall()
-# first, basic publish-search-download run
-try:
-    pub = pexpect()
-    pub.spawn(
-        None, [
-            publish, '-c', 'test_gnunet_fs_rec_data.conf', '-k', 'testdir',
-            'dir/'
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    # Can't say much for publishing, except that the last one is the toplevel directory
-    pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
-        )
-    )
-    pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
-        )
-    )
-    pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
-        )
-    )
-    pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
-        )
-    )
-    pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
-        )
-    )
-    pub.expect("stdout", re.compile(r"Publishing `.+' done\.\r?\n"))
-    pub.expect(
-        "stdout",
-        re.compile(
-            r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"
-        )
-    )
-    pub.expect(
-        "stdout", re.compile(r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n")
-    )
-    m = pub.expect("stdout", re.compile(r".+\r?\n"))
-    if not m:
-        sys.exit(3)
-    output = m.string
-    url = output[output.find("`") + 1:output.find("'")]
-
-    down = pexpect()
-    down.spawn(
-        None, [
-            download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o',
-            'rdir.gnd', url
-        ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    down.expect("stdout", re.compile(r"Downloading `rdir.gnd' done (.*).\r?\n"))
-
-    d = pexpect()
-    d.spawn(
-        None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT
-    )
-    d.expect("stdout", re.compile(r"Directory `a/' meta data:\r?\n"))
-    d.expect("stdout", re.compile(r"Directory `a/' contents:\r?\n"))
-    d.expect("stdout", re.compile(r"COPYING (.*)\r?\n"))
-    d.expect("stdout", re.compile(r"INSTALL (.*)\r?\n"))
-
-    os.remove("rdir/b.gnd")
-    os.remove("rdir/a.gnd")
-    diff = dcdiff('dir', 'rdir')
-    if len(diff) != 0:
-        raise Exception(
-            "Unexpected difference between source directory and downloaded result:\n{}"
-            .format(diff)
-        )
-
-finally:
-    arm = subprocess.Popen([
-        gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf'
-    ])
-    arm.communicate()
-    if os.name == "nt":
-        shutil.rmtree(
-            os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-rec"), True
-        )
-    else:
-        shutil.rmtree("/tmp/gnunet-test-fs-py-rec", True)
-    shutil.rmtree("dir", True)
-    shutil.rmtree("rdir", True)
-    shutil.rmtree("rdir.gnd", True)
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
deleted file mode 100644
index 82ddb8f49..000000000
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-@INLINE@ test_fs_defaults.conf
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-py-rec/
-
-[transport]
-PLUGINS = 
-
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 5b1464d89..574c57639 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -5,4 +5,5 @@ SUBDIRS = \
         namecache \
         namestore \
         revocation \
-        gns
+        gns \
+        fs
diff --git a/src/plugin/fs/Makefile.am b/src/plugin/fs/Makefile.am
new file mode 100644
index 000000000..928997e4d
--- /dev/null
+++ b/src/plugin/fs/Makefile.am
@@ -0,0 +1,36 @@
+# 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/
+
+plugindir = $(libdir)/gnunet
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_fs.la
+
+libgnunet_plugin_block_fs_la_SOURCES = \
+  plugin_block_fs.c
+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 = \
+ $(GN_PLUGIN_LDFLAGS)
+
+check_PROGRAMS = \
+ test_plugin_block_fs
+
+test_plugin_block_fs_SOURCES = \
+ test_plugin_block_fs.c
+test_plugin_block_fs_LDADD = \
+ $(top_builddir)/src/lib/block/libgnunetblock.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/fs/plugin_block_fs.c b/src/plugin/fs/plugin_block_fs.c
index bbd0ff57b..bbd0ff57b 100644
--- a/src/fs/plugin_block_fs.c
+++ b/src/plugin/fs/plugin_block_fs.c
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 34ae7945f..ff17f89a2 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -26,5 +26,6 @@ SUBDIRS = \
   revocation \
         vpn \
   gns \
-  zonemaster
+  zonemaster \
+        fs
 
diff --git a/src/fs/.gitignore b/src/service/fs/.gitignore
index f0e2a4f7b..f3637f186 100644
--- a/src/fs/.gitignore
+++ b/src/service/fs/.gitignore
@@ -1,13 +1,6 @@
-gnunet-unindex
-gnunet-auto-share
 gnunet-daemon-fsprofiler
-gnunet-directory
-gnunet-download
-gnunet-fs
 gnunet-fs-profiler
 gnunet-helper-fs-publish
-gnunet-publish
-gnunet-search
 gnunet-service-fs
 test_fs_directory
 test_fs_download
diff --git a/src/fs/Makefile.am b/src/service/fs/Makefile.am
index 38d75c0dc..93c8814ca 100644
--- a/src/fs/Makefile.am
+++ b/src/service/fs/Makefile.am
@@ -13,14 +13,8 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   fs.conf
 
-plugindir = $(libdir)/gnunet
-
-
 lib_LTLIBRARIES = libgnunetfs.la
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_fs.la
-
 libgnunetfs_la_SOURCES = \
   fs_api.c fs_api.h fs.h \
   fs_directory.c \
@@ -64,70 +58,6 @@ libexec_PROGRAMS = \
 noinst_PROGRAMS = \
   gnunet-daemon-fsprofiler
 
-bin_PROGRAMS = \
-  gnunet-auto-share \
-  gnunet-directory \
-  gnunet-download \
-  gnunet-publish \
-  gnunet-search \
-  gnunet-fs \
-  gnunet-unindex
-
-gnunet_directory_SOURCES = \
- gnunet-directory.c
-gnunet_directory_LDADD = \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_directory_LDADD += \
-  -lextractor
-endif
-
-gnunet_fs_SOURCES = \
- gnunet-fs.c
-gnunet_fs_LDADD = \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_fs_LDADD += \
-  -lextractor
-endif
-
-gnunet_download_SOURCES =  \
- gnunet-download.c
-gnunet_download_LDADD =  \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-gnunet_publish_SOURCES =  \
- gnunet-publish.c
-gnunet_publish_LDADD =  \
- $(top_builddir)/src/service/identity/libgnunetidentity.la \
- libgnunetfs.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_publish_LDADD += \
-  -lextractor
-endif
-
-gnunet_auto_share_SOURCES =  \
- gnunet-auto-share.c
-gnunet_auto_share_LDADD =  \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_auto_share_LDADD += \
-  -lextractor
-endif
-
 gnunet_helper_fs_publish_SOURCES =  \
  gnunet-helper-fs-publish.c
 gnunet_helper_fs_publish_LDADD =  \
@@ -140,19 +70,6 @@ gnunet_helper_fs_publish_LDADD += \
   -lextractor
 endif
 
-gnunet_search_SOURCES = \
- gnunet-search.c
-gnunet_search_LDADD = \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-if HAVE_LIBEXTRACTOR
-gnunet_search_LDADD += \
-  -lextractor
-endif
-
-
 gnunet_daemon_fsprofiler_SOURCES =  \
  gnunet-daemon-fsprofiler.c
 gnunet_daemon_fsprofiler_LDADD = \
@@ -183,26 +100,7 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
  $(GN_LIBINTL) -lm
 
-gnunet_unindex_SOURCES = \
- gnunet-unindex.c
-gnunet_unindex_LDADD = \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-libgnunet_plugin_block_fs_la_SOURCES = \
-  plugin_block_fs.c
-libgnunet_plugin_block_fs_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  libgnunetfs.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_fs_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
 check_PROGRAMS = \
- test_plugin_block_fs \
  test_fs_directory \
  test_fs_download \
  test_fs_download_cadet \
@@ -228,24 +126,6 @@ check_PROGRAMS = \
  test_gnunet_service_fs_migration \
  $(FS_BENCHMARKS)
 
-test_plugin_block_fs_SOURCES = \
- test_plugin_block_fs.c
-test_plugin_block_fs_LDADD = \
- $(top_builddir)/src/lib/block/libgnunetblock.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if HAVE_PYTHON
-check_SCRIPTS = \
- test_gnunet_fs_rec.py \
- test_gnunet_fs_idx.py
-
-if HAVE_LIBEXTRACTOR
-check_SCRIPTS += \
- test_gnunet_fs_psd.py
-endif
-endif
-
-
 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 = test_fs_directory \
@@ -259,7 +139,6 @@ TESTS = test_fs_directory \
  test_fs_start_stop \
  test_fs_uri \
  test_fs_meta_data
- # $(check_SCRIPTS)
 endif
 
 
@@ -487,23 +366,6 @@ test_fs_uri_LDADD = \
 #  libgnunetfs.la  \
 #  $(top_builddir)/src/lib/util/libgnunetutil.la
 
-test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_fs_psd.py.in > test_gnunet_fs_psd.py
-        chmod +x test_gnunet_fs_psd.py
-
-test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_fs_rec.py.in > test_gnunet_fs_rec.py
-        chmod +x test_gnunet_fs_rec.py
-
-test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_fs_ns.py.in > test_gnunet_fs_ns.py
-        chmod +x test_gnunet_fs_ns.py
-
-test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile
-        $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_fs_idx.py.in > test_gnunet_fs_idx.py
-        chmod +x test_gnunet_fs_idx.py
-
-
 EXTRA_DIST = \
   fs_test_lib_data.conf \
   perf_gnunet_service_fs_p2p.conf \
@@ -517,15 +379,7 @@ EXTRA_DIST = \
   test_fs_publish_data.conf \
   test_fs_search_data.conf \
   test_fs_unindex_data.conf \
-  test_gnunet_fs_idx_data.conf \
-  test_gnunet_fs_psd_data.conf \
-  test_gnunet_fs_rec_data.conf \
   test_gnunet_fs_rec_data.tgz \
-  test_gnunet_fs_psd.py.in \
-  test_gnunet_fs_rec.py.in \
-  test_gnunet_fs_idx.py.in \
   test_gnunet_service_fs_migration_data.conf \
   test_gnunet_service_fs_p2p_cadet.conf \
   test_pseudonym_data.conf
-
-CLEANFILES = $(check_SCRIPTS)
diff --git a/src/fs/fs.conf.in b/src/service/fs/fs.conf.in
index be02619bf..be02619bf 100644
--- a/src/fs/fs.conf.in
+++ b/src/service/fs/fs.conf.in
diff --git a/src/fs/fs.h b/src/service/fs/fs.h
index c3bae65d2..c3bae65d2 100644
--- a/src/fs/fs.h
+++ b/src/service/fs/fs.h
diff --git a/src/fs/fs_api.c b/src/service/fs/fs_api.c
index 627c58004..627c58004 100644
--- a/src/fs/fs_api.c
+++ b/src/service/fs/fs_api.c
diff --git a/src/fs/fs_api.h b/src/service/fs/fs_api.h
index fdda91928..fdda91928 100644
--- a/src/fs/fs_api.h
+++ b/src/service/fs/fs_api.h
diff --git a/src/fs/fs_directory.c b/src/service/fs/fs_directory.c
index c693f9216..c693f9216 100644
--- a/src/fs/fs_directory.c
+++ b/src/service/fs/fs_directory.c
diff --git a/src/fs/fs_dirmetascan.c b/src/service/fs/fs_dirmetascan.c
index 2379e29ce..2379e29ce 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/service/fs/fs_dirmetascan.c
diff --git a/src/fs/fs_download.c b/src/service/fs/fs_download.c
index 2a21e4810..2a21e4810 100644
--- a/src/fs/fs_download.c
+++ b/src/service/fs/fs_download.c
diff --git a/src/fs/fs_file_information.c b/src/service/fs/fs_file_information.c
index f23b9da2a..f23b9da2a 100644
--- a/src/fs/fs_file_information.c
+++ b/src/service/fs/fs_file_information.c
diff --git a/src/fs/fs_getopt.c b/src/service/fs/fs_getopt.c
index 0135e2e05..0135e2e05 100644
--- a/src/fs/fs_getopt.c
+++ b/src/service/fs/fs_getopt.c
diff --git a/src/fs/fs_list_indexed.c b/src/service/fs/fs_list_indexed.c
index 78816cad1..78816cad1 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/service/fs/fs_list_indexed.c
diff --git a/src/fs/fs_misc.c b/src/service/fs/fs_misc.c
index a8e23f042..a8e23f042 100644
--- a/src/fs/fs_misc.c
+++ b/src/service/fs/fs_misc.c
diff --git a/src/fs/fs_namespace.c b/src/service/fs/fs_namespace.c
index f8b7b91c0..f8b7b91c0 100644
--- a/src/fs/fs_namespace.c
+++ b/src/service/fs/fs_namespace.c
diff --git a/src/fs/fs_publish.c b/src/service/fs/fs_publish.c
index d1662c78b..d1662c78b 100644
--- a/src/fs/fs_publish.c
+++ b/src/service/fs/fs_publish.c
diff --git a/src/fs/fs_publish_ksk.c b/src/service/fs/fs_publish_ksk.c
index 3981ad335..3981ad335 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/service/fs/fs_publish_ksk.c
diff --git a/src/fs/fs_publish_ublock.c b/src/service/fs/fs_publish_ublock.c
index ad12d9b08..ad12d9b08 100644
--- a/src/fs/fs_publish_ublock.c
+++ b/src/service/fs/fs_publish_ublock.c
diff --git a/src/fs/fs_publish_ublock.h b/src/service/fs/fs_publish_ublock.h
index 4adffc6c1..4adffc6c1 100644
--- a/src/fs/fs_publish_ublock.h
+++ b/src/service/fs/fs_publish_ublock.h
diff --git a/src/fs/fs_search.c b/src/service/fs/fs_search.c
index 8b8c54c67..8b8c54c67 100644
--- a/src/fs/fs_search.c
+++ b/src/service/fs/fs_search.c
diff --git a/src/fs/fs_sharetree.c b/src/service/fs/fs_sharetree.c
index 6c246a3ad..6c246a3ad 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/service/fs/fs_sharetree.c
diff --git a/src/fs/fs_test_lib.c b/src/service/fs/fs_test_lib.c
index f80a2859c..f80a2859c 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/service/fs/fs_test_lib.c
diff --git a/src/fs/fs_test_lib.h b/src/service/fs/fs_test_lib.h
index 36244eb19..36244eb19 100644
--- a/src/fs/fs_test_lib.h
+++ b/src/service/fs/fs_test_lib.h
diff --git a/src/fs/fs_test_lib_data.conf b/src/service/fs/fs_test_lib_data.conf
index c99674798..c99674798 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/service/fs/fs_test_lib_data.conf
diff --git a/src/fs/fs_tree.c b/src/service/fs/fs_tree.c
index 65f589966..65f589966 100644
--- a/src/fs/fs_tree.c
+++ b/src/service/fs/fs_tree.c
diff --git a/src/fs/fs_tree.h b/src/service/fs/fs_tree.h
index 1fb681d27..1fb681d27 100644
--- a/src/fs/fs_tree.h
+++ b/src/service/fs/fs_tree.h
diff --git a/src/fs/fs_unindex.c b/src/service/fs/fs_unindex.c
index 68ba667c4..68ba667c4 100644
--- a/src/fs/fs_unindex.c
+++ b/src/service/fs/fs_unindex.c
diff --git a/src/fs/fs_uri.c b/src/service/fs/fs_uri.c
index b0be0db4f..b0be0db4f 100644
--- a/src/fs/fs_uri.c
+++ b/src/service/fs/fs_uri.c
diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/service/fs/gnunet-daemon-fsprofiler.c
index b99933cfa..b99933cfa 100644
--- a/src/fs/gnunet-daemon-fsprofiler.c
+++ b/src/service/fs/gnunet-daemon-fsprofiler.c
diff --git a/src/fs/gnunet-fs-profiler.c b/src/service/fs/gnunet-fs-profiler.c
index 62da46834..62da46834 100644
--- a/src/fs/gnunet-fs-profiler.c
+++ b/src/service/fs/gnunet-fs-profiler.c
diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/service/fs/gnunet-helper-fs-publish.c
index 0e07b79dc..0e07b79dc 100644
--- a/src/fs/gnunet-helper-fs-publish.c
+++ b/src/service/fs/gnunet-helper-fs-publish.c
diff --git a/src/fs/gnunet-service-fs.c b/src/service/fs/gnunet-service-fs.c
index 1ab6ac2b8..1ab6ac2b8 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/service/fs/gnunet-service-fs.c
diff --git a/src/fs/gnunet-service-fs.h b/src/service/fs/gnunet-service-fs.h
index e102a1fba..e102a1fba 100644
--- a/src/fs/gnunet-service-fs.h
+++ b/src/service/fs/gnunet-service-fs.h
diff --git a/src/fs/gnunet-service-fs_cadet.h b/src/service/fs/gnunet-service-fs_cadet.h
index c02021a0d..c02021a0d 100644
--- a/src/fs/gnunet-service-fs_cadet.h
+++ b/src/service/fs/gnunet-service-fs_cadet.h
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/service/fs/gnunet-service-fs_cadet_client.c
index 398fcd604..398fcd604 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/service/fs/gnunet-service-fs_cadet_client.c
diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/service/fs/gnunet-service-fs_cadet_server.c
index 8bfe91cf0..8bfe91cf0 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/service/fs/gnunet-service-fs_cadet_server.c
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/service/fs/gnunet-service-fs_cp.c
index 74dd42daf..74dd42daf 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/service/fs/gnunet-service-fs_cp.c
diff --git a/src/fs/gnunet-service-fs_cp.h b/src/service/fs/gnunet-service-fs_cp.h
index cea82b10c..cea82b10c 100644
--- a/src/fs/gnunet-service-fs_cp.h
+++ b/src/service/fs/gnunet-service-fs_cp.h
diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/service/fs/gnunet-service-fs_indexing.c
index 8fb34c067..8fb34c067 100644
--- a/src/fs/gnunet-service-fs_indexing.c
+++ b/src/service/fs/gnunet-service-fs_indexing.c
diff --git a/src/fs/gnunet-service-fs_indexing.h b/src/service/fs/gnunet-service-fs_indexing.h
index 244a51900..244a51900 100644
--- a/src/fs/gnunet-service-fs_indexing.h
+++ b/src/service/fs/gnunet-service-fs_indexing.h
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/service/fs/gnunet-service-fs_pe.c
index 60dd0ab70..60dd0ab70 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/service/fs/gnunet-service-fs_pe.c
diff --git a/src/fs/gnunet-service-fs_pe.h b/src/service/fs/gnunet-service-fs_pe.h
index d532b6b71..d532b6b71 100644
--- a/src/fs/gnunet-service-fs_pe.h
+++ b/src/service/fs/gnunet-service-fs_pe.h
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/service/fs/gnunet-service-fs_pr.c
index f192c017d..f192c017d 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/service/fs/gnunet-service-fs_pr.c
diff --git a/src/fs/gnunet-service-fs_pr.h b/src/service/fs/gnunet-service-fs_pr.h
index 339e409c5..339e409c5 100644
--- a/src/fs/gnunet-service-fs_pr.h
+++ b/src/service/fs/gnunet-service-fs_pr.h
diff --git a/src/fs/gnunet-service-fs_push.c b/src/service/fs/gnunet-service-fs_push.c
index 92dbba8e6..92dbba8e6 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/service/fs/gnunet-service-fs_push.c
diff --git a/src/fs/gnunet-service-fs_push.h b/src/service/fs/gnunet-service-fs_push.h
index 2cd621bbb..2cd621bbb 100644
--- a/src/fs/gnunet-service-fs_push.h
+++ b/src/service/fs/gnunet-service-fs_push.h
diff --git a/src/fs/gnunet-service-fs_put.c b/src/service/fs/gnunet-service-fs_put.c
index ca2c85724..ca2c85724 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/service/fs/gnunet-service-fs_put.c
diff --git a/src/fs/gnunet-service-fs_put.h b/src/service/fs/gnunet-service-fs_put.h
index b6c9ba86f..b6c9ba86f 100644
--- a/src/fs/gnunet-service-fs_put.h
+++ b/src/service/fs/gnunet-service-fs_put.h
diff --git a/src/fs/meson.build b/src/service/fs/meson.build
index 4246e4fcf..4246e4fcf 100644
--- a/src/fs/meson.build
+++ b/src/service/fs/meson.build
diff --git a/src/fs/meta_data.c b/src/service/fs/meta_data.c
index 1e75ecf6c..1e75ecf6c 100644
--- a/src/fs/meta_data.c
+++ b/src/service/fs/meta_data.c
diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/service/fs/perf_gnunet_service_fs_p2p.c
index 2c7830f5f..2c7830f5f 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.c
+++ b/src/service/fs/perf_gnunet_service_fs_p2p.c
diff --git a/src/fs/perf_gnunet_service_fs_p2p.conf b/src/service/fs/perf_gnunet_service_fs_p2p.conf
index 00f0f512e..00f0f512e 100644
--- a/src/fs/perf_gnunet_service_fs_p2p.conf
+++ b/src/service/fs/perf_gnunet_service_fs_p2p.conf
diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/service/fs/perf_gnunet_service_fs_p2p_respect.c
index 6b71b1f93..6b71b1f93 100644
--- a/src/fs/perf_gnunet_service_fs_p2p_respect.c
+++ b/src/service/fs/perf_gnunet_service_fs_p2p_respect.c
diff --git a/src/fs/test_fs.c b/src/service/fs/test_fs.c
index 7a57e98b0..7a57e98b0 100644
--- a/src/fs/test_fs.c
+++ b/src/service/fs/test_fs.c
diff --git a/src/fs/test_fs_data.conf b/src/service/fs/test_fs_data.conf
index 993141064..993141064 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/service/fs/test_fs_data.conf
diff --git a/src/fs/test_fs_defaults.conf b/src/service/fs/test_fs_defaults.conf
index 6ead78257..6ead78257 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/service/fs/test_fs_defaults.conf
diff --git a/src/fs/test_fs_directory.c b/src/service/fs/test_fs_directory.c
index f5121a3e7..f5121a3e7 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/service/fs/test_fs_directory.c
diff --git a/src/fs/test_fs_download.c b/src/service/fs/test_fs_download.c
index fc6b32c0f..fc6b32c0f 100644
--- a/src/fs/test_fs_download.c
+++ b/src/service/fs/test_fs_download.c
diff --git a/src/fs/test_fs_download_data.conf b/src/service/fs/test_fs_download_data.conf
index 160dec3ae..160dec3ae 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/service/fs/test_fs_download_data.conf
diff --git a/src/fs/test_fs_download_indexed.conf b/src/service/fs/test_fs_download_indexed.conf
index 7f1e36935..7f1e36935 100644
--- a/src/fs/test_fs_download_indexed.conf
+++ b/src/service/fs/test_fs_download_indexed.conf
diff --git a/src/fs/test_fs_download_persistence.c b/src/service/fs/test_fs_download_persistence.c
index b66fefd6b..b66fefd6b 100644
--- a/src/fs/test_fs_download_persistence.c
+++ b/src/service/fs/test_fs_download_persistence.c
diff --git a/src/fs/test_fs_file_information.c b/src/service/fs/test_fs_file_information.c
index 15380bfc4..15380bfc4 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/service/fs/test_fs_file_information.c
diff --git a/src/fs/test_fs_file_information_data.conf b/src/service/fs/test_fs_file_information_data.conf
index c8fc0938c..c8fc0938c 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/service/fs/test_fs_file_information_data.conf
diff --git a/src/fs/test_fs_getopt.c b/src/service/fs/test_fs_getopt.c
index 3d0da752b..3d0da752b 100644
--- a/src/fs/test_fs_getopt.c
+++ b/src/service/fs/test_fs_getopt.c
diff --git a/src/fs/test_fs_list_indexed.c b/src/service/fs/test_fs_list_indexed.c
index 7e06c47f5..7e06c47f5 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/service/fs/test_fs_list_indexed.c
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/service/fs/test_fs_list_indexed_data.conf
index 941809322..941809322 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/service/fs/test_fs_list_indexed_data.conf
diff --git a/src/fs/test_fs_meta_data.c b/src/service/fs/test_fs_meta_data.c
index 4e7439d7b..4e7439d7b 100644
--- a/src/fs/test_fs_meta_data.c
+++ b/src/service/fs/test_fs_meta_data.c
diff --git a/src/fs/test_fs_namespace.c b/src/service/fs/test_fs_namespace.c
index 85d489598..85d489598 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/service/fs/test_fs_namespace.c
diff --git a/src/fs/test_fs_namespace_data.conf b/src/service/fs/test_fs_namespace_data.conf
index 70b954f7d..70b954f7d 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/service/fs/test_fs_namespace_data.conf
diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/service/fs/test_fs_namespace_list_updateable.c
index d883b7bea..d883b7bea 100644
--- a/src/fs/test_fs_namespace_list_updateable.c
+++ b/src/service/fs/test_fs_namespace_list_updateable.c
diff --git a/src/fs/test_fs_publish.c b/src/service/fs/test_fs_publish.c
index 0e379bc29..0e379bc29 100644
--- a/src/fs/test_fs_publish.c
+++ b/src/service/fs/test_fs_publish.c
diff --git a/src/fs/test_fs_publish_data.conf b/src/service/fs/test_fs_publish_data.conf
index 0930cdfed..0930cdfed 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/service/fs/test_fs_publish_data.conf
diff --git a/src/fs/test_fs_publish_persistence.c b/src/service/fs/test_fs_publish_persistence.c
index e1563f448..e1563f448 100644
--- a/src/fs/test_fs_publish_persistence.c
+++ b/src/service/fs/test_fs_publish_persistence.c
diff --git a/src/fs/test_fs_search.c b/src/service/fs/test_fs_search.c
index f9266582e..f9266582e 100644
--- a/src/fs/test_fs_search.c
+++ b/src/service/fs/test_fs_search.c
diff --git a/src/fs/test_fs_search_data.conf b/src/service/fs/test_fs_search_data.conf
index 8b24e328d..8b24e328d 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/service/fs/test_fs_search_data.conf
diff --git a/src/fs/test_fs_search_persistence.c b/src/service/fs/test_fs_search_persistence.c
index 4ddd40e73..4ddd40e73 100644
--- a/src/fs/test_fs_search_persistence.c
+++ b/src/service/fs/test_fs_search_persistence.c
diff --git a/src/fs/test_fs_search_probes.c b/src/service/fs/test_fs_search_probes.c
index 776babaee..776babaee 100644
--- a/src/fs/test_fs_search_probes.c
+++ b/src/service/fs/test_fs_search_probes.c
diff --git a/src/fs/test_fs_search_with_and.c b/src/service/fs/test_fs_search_with_and.c
index 9c20936b6..9c20936b6 100644
--- a/src/fs/test_fs_search_with_and.c
+++ b/src/service/fs/test_fs_search_with_and.c
diff --git a/src/fs/test_fs_start_stop.c b/src/service/fs/test_fs_start_stop.c
index 509fbe76a..509fbe76a 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/service/fs/test_fs_start_stop.c
diff --git a/src/fs/test_fs_test_lib.c b/src/service/fs/test_fs_test_lib.c
index 714dd452e..714dd452e 100644
--- a/src/fs/test_fs_test_lib.c
+++ b/src/service/fs/test_fs_test_lib.c
diff --git a/src/fs/test_fs_unindex.c b/src/service/fs/test_fs_unindex.c
index dbc33090d..dbc33090d 100644
--- a/src/fs/test_fs_unindex.c
+++ b/src/service/fs/test_fs_unindex.c
diff --git a/src/fs/test_fs_unindex_data.conf b/src/service/fs/test_fs_unindex_data.conf
index dde401857..dde401857 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/service/fs/test_fs_unindex_data.conf
diff --git a/src/fs/test_fs_unindex_persistence.c b/src/service/fs/test_fs_unindex_persistence.c
index b81ce64ab..b81ce64ab 100644
--- a/src/fs/test_fs_unindex_persistence.c
+++ b/src/service/fs/test_fs_unindex_persistence.c
diff --git a/src/fs/test_fs_uri.c b/src/service/fs/test_fs_uri.c
index e0f23097b..e0f23097b 100644
--- a/src/fs/test_fs_uri.c
+++ b/src/service/fs/test_fs_uri.c
diff --git a/src/fs/test_gnunet_fs_rec_data.tgz b/src/service/fs/test_gnunet_fs_rec_data.tgz
index 697794306..697794306 100644
--- a/src/fs/test_gnunet_fs_rec_data.tgz
+++ b/src/service/fs/test_gnunet_fs_rec_data.tgz
diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/service/fs/test_gnunet_service_fs_migration.c
index 38b00f3e8..38b00f3e8 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/service/fs/test_gnunet_service_fs_migration.c
diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/service/fs/test_gnunet_service_fs_migration_data.conf
index fca6c5a29..fca6c5a29 100644
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/service/fs/test_gnunet_service_fs_migration_data.conf
diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/service/fs/test_gnunet_service_fs_p2p.c
index 2d1fbb788..2d1fbb788 100644
--- a/src/fs/test_gnunet_service_fs_p2p.c
+++ b/src/service/fs/test_gnunet_service_fs_p2p.c
diff --git a/src/fs/test_gnunet_service_fs_p2p_cadet.conf b/src/service/fs/test_gnunet_service_fs_p2p_cadet.conf
index 12e106968..12e106968 100644
--- a/src/fs/test_gnunet_service_fs_p2p_cadet.conf
+++ b/src/service/fs/test_gnunet_service_fs_p2p_cadet.conf
diff --git a/src/fs/test_plugin_block_fs.c b/src/service/fs/test_plugin_block_fs.c
index f15d10b17..f15d10b17 100644
--- a/src/fs/test_plugin_block_fs.c
+++ b/src/service/fs/test_plugin_block_fs.c
diff --git a/src/fs/test_pseudonym_data.conf b/src/service/fs/test_pseudonym_data.conf
index 5827721b8..5827721b8 100644
--- a/src/fs/test_pseudonym_data.conf
+++ b/src/service/fs/test_pseudonym_data.conf