diff --git a/jungfrau/ProcessJFPacket.h b/jungfrau/ProcessJFPacket.h
index 8d4021d7..cfb77a67 100644
--- a/jungfrau/ProcessJFPacket.h
+++ b/jungfrau/ProcessJFPacket.h
@@ -6,7 +6,7 @@
 
 #include "../common/ThreadSafeFIFO.h"
 #include "../common/DiffractionExperiment.h"
-#include "../receiver/host/Completion.h"
+#include "../receiver/Completion.h"
 #include "JFConversion.h"
 #include "JFCalibration.h"
 #include "jf_packet.h"
diff --git a/receiver/host/AcquisitionCounters.cpp b/receiver/AcquisitionCounters.cpp
similarity index 99%
rename from receiver/host/AcquisitionCounters.cpp
rename to receiver/AcquisitionCounters.cpp
index 9cb4f797..1ad29e56 100644
--- a/receiver/host/AcquisitionCounters.cpp
+++ b/receiver/AcquisitionCounters.cpp
@@ -4,7 +4,7 @@
 #include <thread>
 
 #include "AcquisitionCounters.h"
-#include "../../common/JFJochException.h"
+#include "../common/JFJochException.h"
 
 AcquisitionCounters::AcquisitionCounters()
         : head(max_modules, 0), slowest_head(0), total_packets(0), expected_frames(0), acquisition_finished(false) {}
diff --git a/receiver/host/AcquisitionCounters.h b/receiver/AcquisitionCounters.h
similarity index 96%
rename from receiver/host/AcquisitionCounters.h
rename to receiver/AcquisitionCounters.h
index d0a78a3c..18fca3b8 100644
--- a/receiver/host/AcquisitionCounters.h
+++ b/receiver/AcquisitionCounters.h
@@ -8,8 +8,8 @@
 #include <shared_mutex>
 #include <vector>
 
-#include "../../common/DiffractionExperiment.h"
-#include "../../common/Definitions.h"
+#include "../common/DiffractionExperiment.h"
+#include "../common/Definitions.h"
 #include "Completion.h"
 
 // AcquisitionCounters are used for information that needs to be accessed during data collection,
diff --git a/receiver/host/AcquisitionDevice.cpp b/receiver/AcquisitionDevice.cpp
similarity index 98%
rename from receiver/host/AcquisitionDevice.cpp
rename to receiver/AcquisitionDevice.cpp
index 70abbe02..dcab83fe 100644
--- a/receiver/host/AcquisitionDevice.cpp
+++ b/receiver/AcquisitionDevice.cpp
@@ -11,9 +11,9 @@
 #include <cmath>
 #include <sstream>
 
-#include "../../common/JFJochException.h"
+#include "../common/JFJochException.h"
 #include "AcquisitionDevice.h"
-#include "../../common/NetworkAddressConvert.h"
+#include "../common/NetworkAddressConvert.h"
 
 void *mmap_acquisition_buffer(size_t size, int16_t numa_node) {
     void *ret = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
diff --git a/receiver/host/AcquisitionDevice.h b/receiver/AcquisitionDevice.h
similarity index 92%
rename from receiver/host/AcquisitionDevice.h
rename to receiver/AcquisitionDevice.h
index 6fae8f0e..e77f4b3f 100644
--- a/receiver/host/AcquisitionDevice.h
+++ b/receiver/AcquisitionDevice.h
@@ -9,14 +9,14 @@
 #include <future>
 #include <unistd.h>
 
-#include <jfjoch.pb.h>
+#include "jfjoch.pb.h"
 
-#include "../../common/Definitions.h"
-#include "../../common/DiffractionExperiment.h"
-#include "../../common/Logger.h"
+#include "../common/Definitions.h"
+#include "../common/DiffractionExperiment.h"
+#include "../common/Logger.h"
 
-#include "../../common/ThreadSafeFIFO.h"
-#include "../../jungfrau/JFCalibration.h"
+#include "../common/ThreadSafeFIFO.h"
+#include "../jungfrau/JFCalibration.h"
 
 #include "AcquisitionCounters.h"
 #include "Completion.h"
diff --git a/receiver/CMakeLists.txt b/receiver/CMakeLists.txt
index daecc3bf..1a1712b6 100644
--- a/receiver/CMakeLists.txt
+++ b/receiver/CMakeLists.txt
@@ -1,4 +1,57 @@
-ADD_SUBDIRECTORY(host)
+ADD_LIBRARY(JungfraujochHost STATIC
+        AcquisitionDevice.cpp AcquisitionDevice.h
+        AcquisitionCounters.cpp AcquisitionCounters.h
+        MockAcquisitionDevice.cpp MockAcquisitionDevice.h
+        HLSSimulatedDevice.cpp HLSSimulatedDevice.h
+        Completion.cpp Completion.h ../fpga/pcie_driver/ActionConfig.h
+        PCIExpressDevice.cpp PCIExpressDevice.h
+        IBWrappers.cpp IBWrappers.h
+        MlxRawEthDevice.cpp MlxRawEthDevice.h
+        ../jungfrau/jf_packet.h
+        LinuxSocketDevice.cpp LinuxSocketDevice.h
+        FPGAAcquisitionDevice.cpp FPGAAcquisitionDevice.h)
+
+TARGET_LINK_LIBRARIES(JungfraujochHost CommonFunctions HLSSimulation JFCalibration)
+
+FIND_LIBRARY(IBVERBS NAMES ibverbs DOC "Infiniband verbs")
+
+IF(IBVERBS)
+    TARGET_COMPILE_DEFINITIONS(JungfraujochHost PUBLIC -DJFJOCH_USE_IBVERBS)
+    TARGET_LINK_LIBRARIES(JungfraujochHost ${IBVERBS})
+    MESSAGE(STATUS "JFJochReceiver compiled with IBVerbs support")
+
+    ADD_EXECUTABLE(jfjoch_mlx_test jfjoch_mlx_test.cpp)
+    TARGET_LINK_LIBRARIES(jfjoch_mlx_test JungfraujochHost)
+    INSTALL(TARGETS jfjoch_mlx_test RUNTIME)
+ENDIF()
+
+ADD_EXECUTABLE(jfjoch_lxsocket_test jfjoch_lxsocket_test.cpp)
+TARGET_LINK_LIBRARIES(jfjoch_lxsocket_test JungfraujochHost)
+INSTALL(TARGETS jfjoch_lxsocket_test RUNTIME)
+
+IF(HAS_NUMAIF AND HAS_NUMA_H AND NUMA_LIBRARY)
+    TARGET_COMPILE_DEFINITIONS(JungfraujochHost PUBLIC -DJFJOCH_USE_NUMA)
+    TARGET_LINK_LIBRARIES(JungfraujochHost ${NUMA_LIBRARY})
+    MESSAGE(STATUS "NUMA memory/CPU pinning enabled")
+ELSE()
+    MESSAGE(WARNING "NUMA memory/CPU pinning disabled")
+ENDIF()
+
+ADD_EXECUTABLE(jfjoch_pcie_status jfjoch_pcie_status.cpp)
+TARGET_LINK_LIBRARIES(jfjoch_pcie_status JungfraujochHost)
+INSTALL(TARGETS jfjoch_pcie_status RUNTIME)
+
+ADD_EXECUTABLE(jfjoch_pcie_set_network jfjoch_pcie_set_network.cpp)
+TARGET_LINK_LIBRARIES(jfjoch_pcie_set_network JungfraujochHost)
+INSTALL(TARGETS jfjoch_pcie_set_network RUNTIME)
+
+ADD_EXECUTABLE(jfjoch_pcie_cancel_data_collection jfjoch_pcie_cancel_data_collection.cpp)
+TARGET_LINK_LIBRARIES(jfjoch_pcie_cancel_data_collection JungfraujochHost)
+INSTALL(TARGETS jfjoch_pcie_cancel_data_collection RUNTIME)
+
+ADD_EXECUTABLE(jfjoch_pcie_clear_net_counters jfjoch_pcie_clear_net_counters.cpp)
+TARGET_LINK_LIBRARIES(jfjoch_pcie_clear_net_counters JungfraujochHost)
+INSTALL(TARGETS jfjoch_pcie_clear_net_counters RUNTIME)
 
 ADD_LIBRARY(JFJochReceiver STATIC
         JFJochReceiverService.cpp JFJochReceiverService.h
diff --git a/receiver/host/Completion.cpp b/receiver/Completion.cpp
similarity index 95%
rename from receiver/host/Completion.cpp
rename to receiver/Completion.cpp
index 505a5ee9..c9455aa4 100644
--- a/receiver/host/Completion.cpp
+++ b/receiver/Completion.cpp
@@ -4,8 +4,8 @@
 #include <bitset>
 
 #include "Completion.h"
-#include "../../common/JFJochException.h"
-#include "../../common/Definitions.h"
+#include "../common/JFJochException.h"
+#include "../common/Definitions.h"
 
 inline uint64_t bit_concat(uint32_t high, uint32_t low) {
     return (uint64_t(high) << 32) | low;
diff --git a/receiver/host/Completion.h b/receiver/Completion.h
similarity index 100%
rename from receiver/host/Completion.h
rename to receiver/Completion.h
diff --git a/receiver/host/FPGAAcquisitionDevice.cpp b/receiver/FPGAAcquisitionDevice.cpp
similarity index 100%
rename from receiver/host/FPGAAcquisitionDevice.cpp
rename to receiver/FPGAAcquisitionDevice.cpp
diff --git a/receiver/host/FPGAAcquisitionDevice.h b/receiver/FPGAAcquisitionDevice.h
similarity index 97%
rename from receiver/host/FPGAAcquisitionDevice.h
rename to receiver/FPGAAcquisitionDevice.h
index aac404a0..dafbac36 100644
--- a/receiver/host/FPGAAcquisitionDevice.h
+++ b/receiver/FPGAAcquisitionDevice.h
@@ -5,7 +5,7 @@
 #define JUNGFRAUJOCH_FPGAACQUISITIONDEVICE_H
 
 #include "AcquisitionDevice.h"
-#include "../../fpga/pcie_driver/ActionConfig.h"
+#include "../fpga/pcie_driver/ActionConfig.h"
 
 class FPGAAcquisitionDevice : public AcquisitionDevice {
     uint16_t data_collection_id = 0;
diff --git a/receiver/host/HLSSimulatedDevice.cpp b/receiver/HLSSimulatedDevice.cpp
similarity index 99%
rename from receiver/host/HLSSimulatedDevice.cpp
rename to receiver/HLSSimulatedDevice.cpp
index f151bd05..15a66f10 100644
--- a/receiver/host/HLSSimulatedDevice.cpp
+++ b/receiver/HLSSimulatedDevice.cpp
@@ -5,8 +5,8 @@
 
 #include <bitset>
 #include <arpa/inet.h>
-#include "../../fpga/hls/datamover_model.h"
-#include "../../fpga/hls/hls_jfjoch.h"
+#include "../fpga/hls/datamover_model.h"
+#include "../fpga/hls/hls_jfjoch.h"
 
 uint16_t checksum(const uint16_t *addr, size_t count) {
 /* Compute Internet Checksum for "count" bytes
diff --git a/receiver/host/HLSSimulatedDevice.h b/receiver/HLSSimulatedDevice.h
similarity index 92%
rename from receiver/host/HLSSimulatedDevice.h
rename to receiver/HLSSimulatedDevice.h
index 208d1ba9..770fda6c 100644
--- a/receiver/host/HLSSimulatedDevice.h
+++ b/receiver/HLSSimulatedDevice.h
@@ -6,11 +6,11 @@
 
 #include <thread>
 
-#include "../../fpga/hls/hls_jfjoch.h"
-#include "../../fpga/hls/datamover_model.h"
-#include "../../common/DiffractionExperiment.h"
+#include "../fpga/hls/hls_jfjoch.h"
+#include "../fpga/hls/datamover_model.h"
+#include "../common/DiffractionExperiment.h"
 #include "FPGAAcquisitionDevice.h"
-#include "../../jungfrau/jf_packet.h"
+#include "../jungfrau/jf_packet.h"
 
 uint16_t checksum(const uint16_t *addr, size_t count);
 
diff --git a/receiver/host/IBWrappers.cpp b/receiver/IBWrappers.cpp
similarity index 99%
rename from receiver/host/IBWrappers.cpp
rename to receiver/IBWrappers.cpp
index b09e35a6..07b55a7c 100644
--- a/receiver/host/IBWrappers.cpp
+++ b/receiver/IBWrappers.cpp
@@ -13,7 +13,7 @@
 #endif
 
 #include "IBWrappers.h"
-#include "../../common/JFJochException.h"
+#include "../common/JFJochException.h"
 
 IBContext::IBContext(const std::string &dev_name) {
     struct ibv_device **dev_list;
diff --git a/receiver/host/IBWrappers.h b/receiver/IBWrappers.h
similarity index 100%
rename from receiver/host/IBWrappers.h
rename to receiver/IBWrappers.h
diff --git a/receiver/JFJochReceiver.h b/receiver/JFJochReceiver.h
index 5b71608e..8ff2849f 100644
--- a/receiver/JFJochReceiver.h
+++ b/receiver/JFJochReceiver.h
@@ -18,7 +18,7 @@
 #include "../jungfrau/JFCalibration.h"
 #include "../common/ImagePusher.h"
 
-#include "host/AcquisitionDevice.h"
+#include "AcquisitionDevice.h"
 #include "../common/Logger.h"
 #include "../common/ThreadSafeFIFO.h"
 #include "../common/ZMQPreviewPublisher.h"
diff --git a/receiver/host/LinuxSocketDevice.cpp b/receiver/LinuxSocketDevice.cpp
similarity index 98%
rename from receiver/host/LinuxSocketDevice.cpp
rename to receiver/LinuxSocketDevice.cpp
index 4a9e5ef3..75de133c 100644
--- a/receiver/host/LinuxSocketDevice.cpp
+++ b/receiver/LinuxSocketDevice.cpp
@@ -8,7 +8,7 @@
 #include <ifaddrs.h>
 #include <linux/if_packet.h>
 
-#include "../../common/NetworkAddressConvert.h"
+#include "../common/NetworkAddressConvert.h"
 
 LinuxSocketDevice::LinuxSocketDevice(uint32_t in_ipv4_addr, uint16_t in_udp_port,
                                      uint16_t data_stream, size_t in_frame_buffer_size_modules,
diff --git a/receiver/host/LinuxSocketDevice.h b/receiver/LinuxSocketDevice.h
similarity index 95%
rename from receiver/host/LinuxSocketDevice.h
rename to receiver/LinuxSocketDevice.h
index 722d47a3..c8f7efbf 100644
--- a/receiver/host/LinuxSocketDevice.h
+++ b/receiver/LinuxSocketDevice.h
@@ -5,7 +5,7 @@
 #define JUNGFRAUJOCH_LINUXSOCKETDEVICE_H
 
 #include <future>
-#include "../../jungfrau/ProcessJFPacket.h"
+#include "../jungfrau/ProcessJFPacket.h"
 #include "AcquisitionDevice.h"
 
 class LinuxSocketDevice : public AcquisitionDevice {
diff --git a/receiver/host/MlxRawEthDevice.cpp b/receiver/MlxRawEthDevice.cpp
similarity index 99%
rename from receiver/host/MlxRawEthDevice.cpp
rename to receiver/MlxRawEthDevice.cpp
index 782ff909..c729d285 100644
--- a/receiver/host/MlxRawEthDevice.cpp
+++ b/receiver/MlxRawEthDevice.cpp
@@ -3,7 +3,7 @@
 
 #ifdef JFJOCH_USE_IBVERBS
 #include "MlxRawEthDevice.h"
-#include "../../common/NetworkAddressConvert.h"
+#include "../common/NetworkAddressConvert.h"
 
 #include <netinet/in.h>
 
diff --git a/receiver/host/MlxRawEthDevice.h b/receiver/MlxRawEthDevice.h
similarity index 96%
rename from receiver/host/MlxRawEthDevice.h
rename to receiver/MlxRawEthDevice.h
index 7e662cde..0c0a8e69 100644
--- a/receiver/host/MlxRawEthDevice.h
+++ b/receiver/MlxRawEthDevice.h
@@ -10,7 +10,7 @@
 
 #include "AcquisitionDevice.h"
 #include "IBWrappers.h"
-#include "../../jungfrau/ProcessJFPacket.h"
+#include "../jungfrau/ProcessJFPacket.h"
 
 class MlxRawEthDevice : public AcquisitionDevice {
 
diff --git a/receiver/host/MockAcquisitionDevice.cpp b/receiver/MockAcquisitionDevice.cpp
similarity index 98%
rename from receiver/host/MockAcquisitionDevice.cpp
rename to receiver/MockAcquisitionDevice.cpp
index 99dd3859..fbe30770 100644
--- a/receiver/host/MockAcquisitionDevice.cpp
+++ b/receiver/MockAcquisitionDevice.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "MockAcquisitionDevice.h"
-#include "../../common/JFJochException.h"
+#include "../common/JFJochException.h"
 #include <bitset>
 
 void MockAcquisitionDevice::Start(const DiffractionExperiment& experiment) {
diff --git a/receiver/host/MockAcquisitionDevice.h b/receiver/MockAcquisitionDevice.h
similarity index 95%
rename from receiver/host/MockAcquisitionDevice.h
rename to receiver/MockAcquisitionDevice.h
index 821b5e7c..0a3cddd4 100644
--- a/receiver/host/MockAcquisitionDevice.h
+++ b/receiver/MockAcquisitionDevice.h
@@ -5,7 +5,7 @@
 #define JUNGFRAUJOCH_MOCKACQUISITIONDEVICE_H
 
 #include "AcquisitionDevice.h"
-#include "../../common/ThreadSafeFIFO.h"
+#include "../common/ThreadSafeFIFO.h"
 
 class MockAcquisitionDevice : public AcquisitionDevice {
     uint32_t current_handle = 0;
diff --git a/receiver/host/PCIExpressDevice.cpp b/receiver/PCIExpressDevice.cpp
similarity index 98%
rename from receiver/host/PCIExpressDevice.cpp
rename to receiver/PCIExpressDevice.cpp
index a6fdd761..aa96416e 100644
--- a/receiver/host/PCIExpressDevice.cpp
+++ b/receiver/PCIExpressDevice.cpp
@@ -7,8 +7,8 @@
 #include <thread>
 
 #include "PCIExpressDevice.h"
-#include "../pcie_driver/jfjoch_ioctl.h"
-#include "../../common/NetworkAddressConvert.h"
+#include "../fpga/pcie_driver/jfjoch_ioctl.h"
+#include "../common/NetworkAddressConvert.h"
 
 PCIExpressDevice::PCIExpressDevice(uint16_t data_stream, uint16_t pci_slot) :
         PCIExpressDevice("/dev/jfjoch" + std::to_string(pci_slot), data_stream) {
diff --git a/receiver/host/PCIExpressDevice.h b/receiver/PCIExpressDevice.h
similarity index 100%
rename from receiver/host/PCIExpressDevice.h
rename to receiver/PCIExpressDevice.h
diff --git a/receiver/host/CMakeLists.txt b/receiver/host/CMakeLists.txt
deleted file mode 100644
index ebdff51f..00000000
--- a/receiver/host/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-ADD_LIBRARY(JungfraujochHost STATIC
-        AcquisitionDevice.cpp AcquisitionDevice.h
-        AcquisitionCounters.cpp AcquisitionCounters.h
-        MockAcquisitionDevice.cpp MockAcquisitionDevice.h
-        HLSSimulatedDevice.cpp HLSSimulatedDevice.h
-        Completion.cpp Completion.h ../../fpga/pcie_driver/ActionConfig.h
-        PCIExpressDevice.cpp PCIExpressDevice.h
-        IBWrappers.cpp IBWrappers.h
-        MlxRawEthDevice.cpp MlxRawEthDevice.h
-        ../../jungfrau/jf_packet.h LinuxSocketDevice.cpp LinuxSocketDevice.h FPGAAcquisitionDevice.cpp FPGAAcquisitionDevice.h)
-
-TARGET_LINK_LIBRARIES(JungfraujochHost CommonFunctions HLSSimulation JFCalibration)
-
-TARGET_INCLUDE_DIRECTORIES(JungfraujochHost PUBLIC ../../include)
-
-FIND_LIBRARY(IBVERBS NAMES ibverbs DOC "Infiniband verbs")
-
-IF(IBVERBS)
-    TARGET_COMPILE_DEFINITIONS(JungfraujochHost PUBLIC -DJFJOCH_USE_IBVERBS)
-    TARGET_LINK_LIBRARIES(JungfraujochHost ${IBVERBS})
-    MESSAGE(STATUS "JFJochReceiver compiled with IBVerbs support")
-
-    ADD_EXECUTABLE(jfjoch_mlx_test jfjoch_mlx_test.cpp)
-    TARGET_LINK_LIBRARIES(jfjoch_mlx_test JungfraujochHost)
-    INSTALL(TARGETS jfjoch_mlx_test RUNTIME)
-ENDIF()
-
-ADD_EXECUTABLE(jfjoch_lxsocket_test jfjoch_lxsocket_test.cpp)
-TARGET_LINK_LIBRARIES(jfjoch_lxsocket_test JungfraujochHost)
-INSTALL(TARGETS jfjoch_lxsocket_test RUNTIME)
-
-IF(HAS_NUMAIF AND HAS_NUMA_H AND NUMA_LIBRARY)
-    TARGET_COMPILE_DEFINITIONS(JungfraujochHost PUBLIC -DJFJOCH_USE_NUMA)
-    TARGET_LINK_LIBRARIES(JungfraujochHost ${NUMA_LIBRARY})
-    MESSAGE(STATUS "NUMA memory/CPU pinning enabled")
-ELSE()
-    MESSAGE(WARNING "NUMA memory/CPU pinning disabled")
-ENDIF()
-
-ADD_EXECUTABLE(jfjoch_pcie_status jfjoch_pcie_status.cpp)
-TARGET_LINK_LIBRARIES(jfjoch_pcie_status JungfraujochHost)
-INSTALL(TARGETS jfjoch_pcie_status RUNTIME)
-
-ADD_EXECUTABLE(jfjoch_pcie_set_network jfjoch_pcie_set_network.cpp)
-TARGET_LINK_LIBRARIES(jfjoch_pcie_set_network JungfraujochHost)
-INSTALL(TARGETS jfjoch_pcie_set_network RUNTIME)
-
-ADD_EXECUTABLE(jfjoch_pcie_cancel_data_collection jfjoch_pcie_cancel_data_collection.cpp)
-TARGET_LINK_LIBRARIES(jfjoch_pcie_cancel_data_collection JungfraujochHost)
-INSTALL(TARGETS jfjoch_pcie_cancel_data_collection RUNTIME)
-
-ADD_EXECUTABLE(jfjoch_pcie_clear_net_counters jfjoch_pcie_clear_net_counters.cpp)
-TARGET_LINK_LIBRARIES(jfjoch_pcie_clear_net_counters JungfraujochHost)
-INSTALL(TARGETS jfjoch_pcie_clear_net_counters RUNTIME)
diff --git a/receiver/jfjoch_action_test.cpp b/receiver/jfjoch_action_test.cpp
index 1a843298..89febe48 100644
--- a/receiver/jfjoch_action_test.cpp
+++ b/receiver/jfjoch_action_test.cpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include "host/PCIExpressDevice.h"
+#include "PCIExpressDevice.h"
 #include "JFJochReceiverTest.h"
 #include "../tests/FPGAUnitTest.h"
 
diff --git a/receiver/host/jfjoch_lxsocket_test.cpp b/receiver/jfjoch_lxsocket_test.cpp
similarity index 100%
rename from receiver/host/jfjoch_lxsocket_test.cpp
rename to receiver/jfjoch_lxsocket_test.cpp
diff --git a/receiver/host/jfjoch_mlx_test.cpp b/receiver/jfjoch_mlx_test.cpp
similarity index 100%
rename from receiver/host/jfjoch_mlx_test.cpp
rename to receiver/jfjoch_mlx_test.cpp
diff --git a/receiver/host/jfjoch_pcie_cancel_data_collection.cpp b/receiver/jfjoch_pcie_cancel_data_collection.cpp
similarity index 100%
rename from receiver/host/jfjoch_pcie_cancel_data_collection.cpp
rename to receiver/jfjoch_pcie_cancel_data_collection.cpp
diff --git a/receiver/host/jfjoch_pcie_clear_net_counters.cpp b/receiver/jfjoch_pcie_clear_net_counters.cpp
similarity index 100%
rename from receiver/host/jfjoch_pcie_clear_net_counters.cpp
rename to receiver/jfjoch_pcie_clear_net_counters.cpp
diff --git a/receiver/host/jfjoch_pcie_set_network.cpp b/receiver/jfjoch_pcie_set_network.cpp
similarity index 84%
rename from receiver/host/jfjoch_pcie_set_network.cpp
rename to receiver/jfjoch_pcie_set_network.cpp
index 2534b95e..98427d57 100644
--- a/receiver/host/jfjoch_pcie_set_network.cpp
+++ b/receiver/jfjoch_pcie_set_network.cpp
@@ -1,10 +1,10 @@
 // Copyright (2019-2022) Paul Scherrer Institute
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "../../common/Logger.h"
-#include "../../common/JFJochException.h"
+#include "../common/Logger.h"
+#include "../common/JFJochException.h"
 #include "PCIExpressDevice.h"
-#include "../../common/NetworkAddressConvert.h"
+#include "../common/NetworkAddressConvert.h"
 
 int main(int argc, char **argv) {
     Logger logger("jfjoch_pcie_set_network");
diff --git a/receiver/host/jfjoch_pcie_status.cpp b/receiver/jfjoch_pcie_status.cpp
similarity index 100%
rename from receiver/host/jfjoch_pcie_status.cpp
rename to receiver/jfjoch_pcie_status.cpp
diff --git a/receiver/jfjoch_receiver.cpp b/receiver/jfjoch_receiver.cpp
index 89ef352c..adf82fae 100644
--- a/receiver/jfjoch_receiver.cpp
+++ b/receiver/jfjoch_receiver.cpp
@@ -6,12 +6,12 @@
 
 #include "../grpc/gRPCServer_Template.h"
 #include "../common/ZMQImagePusher.h"
-#include "host/PCIExpressDevice.h"
-#include "host/MlxRawEthDevice.h"
-#include "host/LinuxSocketDevice.h"
+#include "PCIExpressDevice.h"
+#include "MlxRawEthDevice.h"
+#include "LinuxSocketDevice.h"
 
 #include "JFJochReceiverService.h"
-#include "host/HLSSimulatedDevice.h"
+#include "HLSSimulatedDevice.h"
 #include "../common/NetworkAddressConvert.h"
 
 AcquisitionDevice *SetupAcquisitionDevice(const nlohmann::json &input, uint16_t data_stream) {
diff --git a/tests/AcquisitionCountersTest.cpp b/tests/AcquisitionCountersTest.cpp
index 66c629e8..ce23faca 100644
--- a/tests/AcquisitionCountersTest.cpp
+++ b/tests/AcquisitionCountersTest.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <catch2/catch.hpp>
-#include "../receiver/host/AcquisitionCounters.h"
+#include "../receiver/AcquisitionCounters.h"
 
 TEST_CASE("AcquisitionCountersTest","[AcquisitionDeviceCounters]") {
     DiffractionExperiment x(DetectorGeometry(2));
diff --git a/tests/FPGAIntegrationTest.cpp b/tests/FPGAIntegrationTest.cpp
index 7c3f5ed8..d20d3666 100644
--- a/tests/FPGAIntegrationTest.cpp
+++ b/tests/FPGAIntegrationTest.cpp
@@ -6,7 +6,7 @@
 
 #include <bitshuffle/bitshuffle.h>
 #include "../jungfrau/JFPedestalCalc.h"
-#include "../receiver/host/HLSSimulatedDevice.h"
+#include "../receiver/HLSSimulatedDevice.h"
 #include "FPGAUnitTest.h"
 
 using namespace std::literals::chrono_literals;
diff --git a/tests/FPGANetworkTest.cpp b/tests/FPGANetworkTest.cpp
index 8fad2465..65575f9e 100644
--- a/tests/FPGANetworkTest.cpp
+++ b/tests/FPGANetworkTest.cpp
@@ -6,7 +6,7 @@
 #include <netinet/ip_icmp.h>
 #include <net/if_arp.h>
 
-#include "../receiver/host/HLSSimulatedDevice.h"
+#include "../receiver/HLSSimulatedDevice.h"
 
 // ARP packet - from if_arp.h
 #pragma pack(push)
diff --git a/tests/JFJochFullIntegrationTest.cpp b/tests/JFJochFullIntegrationTest.cpp
index 1bdf5037..d84ba047 100644
--- a/tests/JFJochFullIntegrationTest.cpp
+++ b/tests/JFJochFullIntegrationTest.cpp
@@ -9,7 +9,7 @@
 #include "../writer/HDF5Objects.h"
 #include "../receiver/JFJochReceiverService.h"
 #include "FPGAUnitTest.h"
-#include "../receiver/host/MockAcquisitionDevice.h"
+#include "../receiver/MockAcquisitionDevice.h"
 #include "../common/ZMQImagePusher.h"
 #include "../common/jsonToGrpc.h"
 
diff --git a/tests/JFJochReceiverIntegrationTest.cpp b/tests/JFJochReceiverIntegrationTest.cpp
index 72213ffe..1d86bf77 100644
--- a/tests/JFJochReceiverIntegrationTest.cpp
+++ b/tests/JFJochReceiverIntegrationTest.cpp
@@ -4,7 +4,7 @@
 #include <catch2/catch.hpp>
 
 #include "../receiver/JFJochReceiverTest.h"
-#include "../receiver/host/HLSSimulatedDevice.h"
+#include "../receiver/HLSSimulatedDevice.h"
 #include "../jungfrau/JFPedestalCalc.h"
 #include "../common/TestImagePusher.h"
 
diff --git a/tests/MockAcquisitionDeviceTest.cpp b/tests/MockAcquisitionDeviceTest.cpp
index e54b8cfe..30a72155 100644
--- a/tests/MockAcquisitionDeviceTest.cpp
+++ b/tests/MockAcquisitionDeviceTest.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <catch2/catch.hpp>
-#include "../receiver/host/MockAcquisitionDevice.h"
+#include "../receiver/MockAcquisitionDevice.h"
 
 TEST_CASE("MockAcquisitionDevice") {
     std::vector<uint16_t> module_data(RAW_MODULE_SIZE, 765);
diff --git a/tests/StreamWriterTest.cpp b/tests/StreamWriterTest.cpp
index 492e7a3e..76189913 100644
--- a/tests/StreamWriterTest.cpp
+++ b/tests/StreamWriterTest.cpp
@@ -9,7 +9,7 @@
 #include "../writer/HDF5Objects.h"
 #include "../common/ZMQImagePusher.h"
 #include "../receiver/JFJochReceiverService.h"
-#include "../receiver/host/HLSSimulatedDevice.h"
+#include "../receiver/HLSSimulatedDevice.h"
 
 TEST_CASE("StreamWriterTest_ZMQ","[JFJochWriter]") {
     RegisterHDF5Filter();
diff --git a/tests/gRPCServerTest.cpp b/tests/gRPCServerTest.cpp
index 0c0b3b05..3a1b664a 100644
--- a/tests/gRPCServerTest.cpp
+++ b/tests/gRPCServerTest.cpp
@@ -8,7 +8,7 @@
 #include "../common/Logger.h"
 #include "../receiver/JFJochReceiverService.h"
 #include "../grpc/JFJochReceiverClient.h"
-#include "../receiver/host/HLSSimulatedDevice.h"
+#include "../receiver/HLSSimulatedDevice.h"
 
 #include <grpcpp/grpcpp.h>
 #include "../../common/ZMQImagePusher.h"