diff --git a/pyproject.toml b/pyproject.toml
index 5dcd156f44a..e36f4782fe9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -166,10 +166,11 @@ everest = [
 ]
 
 [tool.setuptools]
+package-dir = {"" = "src"}
 platforms = ["all"]
 
 [tool.setuptools.package-data]
-everest = ["detached/jobs/everserver"]
+everest = ["data/**/*", "*.tmpl", "detached/jobs/everserver"]
 ieverest = ["*.ui"]
 
 
diff --git a/src/everest/detached/jobs/everserver.py b/src/everest/detached/jobs/everserver.py
index 2c7583abeb3..8c3cd4be5da 100755
--- a/src/everest/detached/jobs/everserver.py
+++ b/src/everest/detached/jobs/everserver.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import argparse
 import json
 import logging
@@ -218,7 +217,8 @@ def _configure_loggers(config: EverestConfig):
     )
 
 
-def main(args):
+def main():
+    args = sys.argv[1:]
     arg_parser = argparse.ArgumentParser()
     arg_parser.add_argument("--config-file", type=str)
     arg_parser.add_argument("--debug", action="store_true")
@@ -411,7 +411,3 @@ def _generate_authentication():
     n_bytes = 128
     random_bytes = bytes(os.urandom(n_bytes))
     return b64encode(random_bytes).decode("utf-8")
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/src/everest/detached/jobs/everserver b/src/everest/detached/jobs/fm_everserver
similarity index 75%
rename from src/everest/detached/jobs/everserver
rename to src/everest/detached/jobs/fm_everserver
index cdf6d88d4a5..aee9d30592f 100755
--- a/src/everest/detached/jobs/everserver
+++ b/src/everest/detached/jobs/fm_everserver
@@ -1,4 +1,4 @@
-EXECUTABLE  everserver.py
+EXECUTABLE  everserver
 
 STDOUT ../../logs/everest_server.stdout
 STDERR ../../logs/everest_server.stderr
diff --git a/src/everest/strings.py b/src/everest/strings.py
index da5dc3d80e5..590dbea9eb5 100644
--- a/src/everest/strings.py
+++ b/src/everest/strings.py
@@ -5,7 +5,7 @@
 DEFAULT_OUTPUT_DIR = "everest_output"
 DEFAULT_LOGGING_FORMAT = "%(asctime)s %(name)s %(levelname)s: %(message)s"
 
-EVEREST_SERVER = "everserver"
+EVEREST_SERVER = "fm_everserver"
 EVEREST = "everest"
 
 HOSTFILE_NAME = "hostfile"
diff --git a/test-data/block_storage b/test-data/block_storage
index d5c676582f2..c2d94276fed 160000
--- a/test-data/block_storage
+++ b/test-data/block_storage
@@ -1 +1 @@
-Subproject commit d5c676582f2f015fa0928ca0d77fd77ac75f559b
+Subproject commit c2d94276fed8d83e87cb8ee54b24502e71773ad7