diff --git a/sf-writer/SFWriter.hpp b/core-buffer/include/SFWriter.hpp
similarity index 100%
rename from sf-writer/SFWriter.hpp
rename to core-buffer/include/SFWriter.hpp
diff --git a/sf-writer/SFWriter.cpp b/core-buffer/src/SFWriter.cpp
similarity index 100%
rename from sf-writer/SFWriter.cpp
rename to core-buffer/src/SFWriter.cpp
diff --git a/sf-buffer/CMakeLists.txt b/sf-buffer/CMakeLists.txt
index 0e056bc..0629868 100644
--- a/sf-buffer/CMakeLists.txt
+++ b/sf-buffer/CMakeLists.txt
@@ -56,5 +56,19 @@ target_link_libraries(sf-replay
         boost_system
         pthread)
 
+add_executable(sf-writer src/sf_replay.cpp)
+set_target_properties(sf-writer PROPERTIES OUTPUT_NAME sf_writer)
+
+target_link_libraries(sf-writer
+        core-buffer
+        core-writer
+        external
+        zmq
+        hdf5
+        hdf5_hl
+        hdf5_cpp
+        boost_system
+        pthread)
+
 enable_testing()
 add_subdirectory(test/)
\ No newline at end of file
diff --git a/sf-writer/sf_h5_writer.cpp b/sf-buffer/src/sf_writer.cpp
similarity index 99%
rename from sf-writer/sf_h5_writer.cpp
rename to sf-buffer/src/sf_writer.cpp
index 66ce4e5..020790b 100644
--- a/sf-writer/sf_h5_writer.cpp
+++ b/sf-buffer/src/sf_writer.cpp
@@ -114,7 +114,7 @@ int main (int argc, char *argv[])
 {
     if (argc != 4) {
         cout << endl;
-        cout << "Usage: sf_h5_writer ";
+        cout << "Usage: sf_writer ";
         cout << " [output_file] [start_pulse_id] [stop_pulse_id]";
         cout << endl;
         cout << "\toutput_file: Complete path to the output file." << endl;