diff --git a/sf-replay/include/ReplayH5Reader.hpp b/sf-replay/include/ReplayH5Reader.hpp
deleted file mode 100644
index 009a028..0000000
--- a/sf-replay/include/ReplayH5Reader.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef SF_DAQ_BUFFER_REPLAYH5READER_HPP
-#define SF_DAQ_BUFFER_REPLAYH5READER_HPP
-
-#include <string>
-#include <H5Cpp.h>
-#include <memory>
-
-#include "formats.hpp"
-
-class ReplayH5Reader {
-
-    const std::string device_;
-    const std::string channel_name_;
-
-    H5::H5File current_file_;
-    std::string current_filename_;
-    H5::DataSet dset_metadata_;
-    H5::DataSet dset_frame_;
-
-public:
-    ReplayH5Reader(
-            const std::string device,
-            const std::string channel_name);
-    virtual ~ReplayH5Reader();
-
-    void close_file();
-    void get_buffer(
-            const uint64_t pulse_id,
-            ReplayBuffer* metadata,
-            char* frame_buffer);
-};
-
-
-#endif //SF_DAQ_BUFFER_REPLAYH5READER_HPP
diff --git a/sf-replay/src/ReplayH5Reader.cpp b/sf-replay/src/ReplayH5Reader.cpp
deleted file mode 100644
index 56f8851..0000000
--- a/sf-replay/src/ReplayH5Reader.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#include "ReplayH5Reader.hpp"
-
-#include "BufferUtils.hpp"
-
-using namespace std;
-using namespace core_buffer;
-
-ReplayH5Reader::ReplayH5Reader(
-        const string device,
-        const string channel_name) :
-            device_(device),
-            channel_name_(channel_name)
-{
-}
-
-ReplayH5Reader::~ReplayH5Reader()
-{
-    close_file();
-}
-
-void ReplayH5Reader::close_file()
-{
-    if (current_file_.getId() != -1) {
-        dset_metadata_.close();
-        dset_frame_.close();
-        current_file_.close();
-    }
-}
-
-void ReplayH5Reader::get_buffer(
-        const uint64_t pulse_id,
-        ReplayBuffer* metadata,
-        char* data)
-{
-    auto pulse_filename = BufferUtils::get_filename(
-            device_, channel_name_, pulse_id);
-
-    if (pulse_filename != current_filename_) {
-        close_file();
-
-        current_filename_ = pulse_filename;
-        current_file_ = H5::H5File(current_filename_, H5F_ACC_RDONLY);
-
-        dset_metadata_ = current_file_.openDataSet(BUFFER_H5_METADATA_DATASET);
-        dset_frame_ = current_file_.openDataSet(BUFFER_H5_FRAME_DATASET);
-    }
-
-    auto file_index = BufferUtils::get_file_frame_index(pulse_id);
-    auto cache_start_index = file_index / BUFFER_BLOCK_SIZE;
-    cache_start_index *= BUFFER_BLOCK_SIZE;
-
-    uint64_t b_start_pulse_id = pulse_id - (file_index - cache_start_index);
-    metadata->start_pulse_id = b_start_pulse_id;
-    metadata->n_frames = BUFFER_BLOCK_SIZE;
-
-    hsize_t b_m_dims[2] = {BUFFER_BLOCK_SIZE, ModuleFrame_N_FIELDS};
-    H5::DataSpace b_m_space (2, b_m_dims);
-    hsize_t b_m_count[] = {BUFFER_BLOCK_SIZE, ModuleFrame_N_FIELDS};
-    hsize_t b_m_start[] = {cache_start_index, 0};
-    b_m_space.selectHyperslab(H5S_SELECT_SET, b_m_count, b_m_start);
-
-    hsize_t f_m_dims[2] = {FILE_MOD, ModuleFrame_N_FIELDS};
-    H5::DataSpace f_m_space (2, f_m_dims);
-    hsize_t f_m_count[] = {BUFFER_BLOCK_SIZE, ModuleFrame_N_FIELDS};
-    hsize_t pulse_id_start[] = {cache_start_index, 0};
-    f_m_space.selectHyperslab(H5S_SELECT_SET, f_m_count, pulse_id_start);
-
-    dset_metadata_.read(
-            &metadata->metadata[0],
-            H5::PredType::NATIVE_UINT64, b_m_space, f_m_space);
-
-    hsize_t b_f_dims[3] =
-            {BUFFER_BLOCK_SIZE, MODULE_Y_SIZE, MODULE_X_SIZE};
-    H5::DataSpace b_f_space (3, b_f_dims);
-    hsize_t b_f_count[] =
-            {BUFFER_BLOCK_SIZE, MODULE_Y_SIZE, MODULE_X_SIZE};
-    hsize_t b_f_start[] = {0, 0, 0};
-    b_f_space.selectHyperslab(H5S_SELECT_SET, b_f_count, b_f_start);
-
-    hsize_t f_frame_dims[3] = {FILE_MOD, MODULE_Y_SIZE, MODULE_X_SIZE};
-    H5::DataSpace f_f_space (3, f_frame_dims);
-    hsize_t f_f_count[] =
-            {BUFFER_BLOCK_SIZE, MODULE_Y_SIZE, MODULE_X_SIZE};
-    hsize_t f_f_start[] = {cache_start_index, 0, 0};
-    f_f_space.selectHyperslab(H5S_SELECT_SET, f_f_count, f_f_start);
-
-    dset_frame_.read(
-            data, H5::PredType::NATIVE_UINT16, b_f_space, f_f_space);
-}
diff --git a/sf-writer/src/ImageAssembler.hpp b/sf-writer/include/ImageAssembler.hpp
similarity index 100%
rename from sf-writer/src/ImageAssembler.hpp
rename to sf-writer/include/ImageAssembler.hpp
diff --git a/sf-writer/src/WriterZmqReceiver.cpp b/sf-writer/src/WriterZmqReceiver.cpp
index b01b6f5..0d3d8f8 100644
--- a/sf-writer/src/WriterZmqReceiver.cpp
+++ b/sf-writer/src/WriterZmqReceiver.cpp
@@ -59,7 +59,7 @@ void WriterZmqReceiver::get_next_buffer(
         n_images_in_buffer = images_left;
     }
 
-    i_meta->n_images = (uint16_t)n_images_in_buffer;
+//    i_meta->n_images = (uint16_t)n_images_in_buffer;
 
     for (uint64_t i_pulse=0; i_pulse<n_images_in_buffer; i_pulse++) {
 
diff --git a/sf-writer/src/main.cpp b/sf-writer/src/main.cpp
index 4b64d77..73b20e8 100644
--- a/sf-writer/src/main.cpp
+++ b/sf-writer/src/main.cpp
@@ -9,8 +9,8 @@
 #include "buffer_config.hpp"
 #include "bitshuffle/bitshuffle.h"
 #include "JFH5Writer.hpp"
-#include "BufferBinaryReader.hpp"
 #include "ImageAssembler.hpp"
+#include "../../sf-replay/include/BufferBinaryReader.hpp"
 
 using namespace std;
 using namespace core_buffer;
@@ -85,7 +85,7 @@ int main (int argc, char *argv[])
     uint64_t stop_block = stop_pulse_id / BUFFER_BLOCK_SIZE;
     auto n_blocks = stop_block - start_block + 1;
 
-    ImageAssembler image_assembler;
+    ImageAssembler image_assembler(n_modules);
 
     // Generate list of buffer blocks that need to be loaded.
     std::vector<uint64_t> buffer_blocks(n_blocks);