23 files changed, 9 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 5df94e8e7..a12bf7f30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1305,6 +1305,8 @@ src/contrib/service/abd/abd.conf
 src/contrib/service/auction/Makefile
 src/contrib/service/consensus/Makefile
 src/contrib/service/consensus/consensus.conf
+src/contrib/service/scalarproduct/Makefile
+src/contrib/service/scalarproduct/scalarproduct.conf
 src/contrib/service/secretsharing/Makefile
 src/contrib/service/secretsharing/secretsharing.conf
 src/contrib/service/set/Makefile
@@ -1327,8 +1329,6 @@ src/include/gnunet_config.h
 src/pt/Makefile
 src/revocation/Makefile
 src/revocation/revocation.conf
-src/scalarproduct/Makefile
-src/scalarproduct/scalarproduct.conf
 src/seti/Makefile
 src/seti/seti.conf
 src/setu/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 05bc968e4..dba6e51b6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -52,6 +52,12 @@ src/contrib/service/rps/rps-sampler_client.c
 src/contrib/service/rps/rps-sampler_common.c
 src/contrib/service/rps/rps-test_util.c
 src/contrib/service/rps/rps_api.c
+src/contrib/service/scalarproduct/gnunet-scalarproduct.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
+src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
+src/contrib/service/scalarproduct/scalarproduct_api.c
 src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c
 src/contrib/service/secretsharing/gnunet-service-secretsharing.c
 src/contrib/service/secretsharing/secretsharing_api.c
@@ -316,12 +322,6 @@ src/revocation/gnunet-revocation.c
 src/revocation/gnunet-service-revocation.c
 src/revocation/plugin_block_revocation.c
 src/revocation/revocation_api.c
-src/scalarproduct/gnunet-scalarproduct.c
-src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
-src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
-src/scalarproduct/gnunet-service-scalarproduct_alice.c
-src/scalarproduct/gnunet-service-scalarproduct_bob.c
-src/scalarproduct/scalarproduct_api.c
 src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 0cafaf276..31abebcb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,6 @@ SUBDIRS = \
         contrib \
   seti \
   setu \
-  scalarproduct \
   revocation \
   vpn \
   gns \
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
index cfab56206..4092cc46c 100644
--- a/src/contrib/service/Makefile.am
+++ b/src/contrib/service/Makefile.am
@@ -10,4 +10,5 @@ SUBDIRS = \
         set \
         consensus \
         secretsharing \
+        scalarproduct \
         $(EXP_DIR)
diff --git a/src/scalarproduct/.gitignore b/src/contrib/service/scalarproduct/.gitignore
index 19909a3f9..19909a3f9 100644
--- a/src/scalarproduct/.gitignore
+++ b/src/contrib/service/scalarproduct/.gitignore
diff --git a/src/scalarproduct/Makefile.am b/src/contrib/service/scalarproduct/Makefile.am
index 77a17ec20..77a17ec20 100644
--- a/src/scalarproduct/Makefile.am
+++ b/src/contrib/service/scalarproduct/Makefile.am
diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/contrib/service/scalarproduct/gnunet-scalarproduct.c
index 5ebab5baf..5ebab5baf 100644
--- a/src/scalarproduct/gnunet-scalarproduct.c
+++ b/src/contrib/service/scalarproduct/gnunet-scalarproduct.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc.h
index 5c7a8d8f1..5c7a8d8f1 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc.h
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index b8bac0803..b8bac0803 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
index 1945f1937..1945f1937 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct.h b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct.h
index 4e79afa2f..4e79afa2f 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct.h
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct.h
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
index 0149f45ba..0149f45ba 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_alice.c
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
index 65e732675..65e732675 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c
+++ b/src/contrib/service/scalarproduct/gnunet-service-scalarproduct_bob.c
diff --git a/src/scalarproduct/meson.build b/src/contrib/service/scalarproduct/meson.build
index 296734c2c..296734c2c 100644
--- a/src/scalarproduct/meson.build
+++ b/src/contrib/service/scalarproduct/meson.build
diff --git a/src/scalarproduct/perf_scalarproduct.sh b/src/contrib/service/scalarproduct/perf_scalarproduct.sh
index b15465c9a..b15465c9a 100755
--- a/src/scalarproduct/perf_scalarproduct.sh
+++ b/src/contrib/service/scalarproduct/perf_scalarproduct.sh
diff --git a/src/scalarproduct/scalarproduct.conf.in b/src/contrib/service/scalarproduct/scalarproduct.conf.in
index e2286b076..e2286b076 100644
--- a/src/scalarproduct/scalarproduct.conf.in
+++ b/src/contrib/service/scalarproduct/scalarproduct.conf.in
diff --git a/src/scalarproduct/scalarproduct.h b/src/contrib/service/scalarproduct/scalarproduct.h
index f2311cda0..f2311cda0 100644
--- a/src/scalarproduct/scalarproduct.h
+++ b/src/contrib/service/scalarproduct/scalarproduct.h
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/contrib/service/scalarproduct/scalarproduct_api.c
index 8c667a72e..8c667a72e 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/contrib/service/scalarproduct/scalarproduct_api.c
diff --git a/src/scalarproduct/test_ecc_scalarproduct.c b/src/contrib/service/scalarproduct/test_ecc_scalarproduct.c
index 85460cb05..85460cb05 100644
--- a/src/scalarproduct/test_ecc_scalarproduct.c
+++ b/src/contrib/service/scalarproduct/test_ecc_scalarproduct.c
diff --git a/src/scalarproduct/test_scalarproduct.conf b/src/contrib/service/scalarproduct/test_scalarproduct.conf
index c7e2b55f5..c7e2b55f5 100644
--- a/src/scalarproduct/test_scalarproduct.conf
+++ b/src/contrib/service/scalarproduct/test_scalarproduct.conf
diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/contrib/service/scalarproduct/test_scalarproduct.sh
index ed91cd5c4..ed91cd5c4 100755
--- a/src/scalarproduct/test_scalarproduct.sh
+++ b/src/contrib/service/scalarproduct/test_scalarproduct.sh
diff --git a/src/scalarproduct/test_scalarproduct_negative.sh b/src/contrib/service/scalarproduct/test_scalarproduct_negative.sh
index 459406836..459406836 100755
--- a/src/scalarproduct/test_scalarproduct_negative.sh
+++ b/src/contrib/service/scalarproduct/test_scalarproduct_negative.sh
diff --git a/src/scalarproduct/test_scalarproduct_negativezero.sh b/src/contrib/service/scalarproduct/test_scalarproduct_negativezero.sh
index 6f80b2ea2..6f80b2ea2 100755
--- a/src/scalarproduct/test_scalarproduct_negativezero.sh
+++ b/src/contrib/service/scalarproduct/test_scalarproduct_negativezero.sh