diff --git a/sf_daq_broker/writer/__init__.py b/sf_daq_broker/writer/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/sf_daq_broker/writer.py b/sf_daq_broker/writer/bsread_writer.py
similarity index 98%
rename from sf_daq_broker/writer.py
rename to sf_daq_broker/writer/bsread_writer.py
index 113dfbc..f7ab76f 100644
--- a/sf_daq_broker/writer.py
+++ b/sf_daq_broker/writer/bsread_writer.py
@@ -9,7 +9,7 @@ import requests
 from bsread import source, PULL
 
 from sf_daq_broker import config, utils
-from sf_daq_broker.writer_format import CompactDataBufferH5Writer
+from sf_daq_broker.writer.bsread_writer_format import CompactBsreadH5Writer
 
 _logger = logging.getLogger(__name__)
 
@@ -61,7 +61,7 @@ def write_data_to_file(parameters, json_data):
     
     output_file = parameters["output_file"]
 
-    writer = CompactDataBufferH5Writer(output_file, parameters)
+    writer = CompactBsreadH5Writer(output_file, parameters)
 
     writer.write_data(json_data)
     writer.close()
diff --git a/sf_daq_broker/writer_format.py b/sf_daq_broker/writer/bsread_writer_format.py
similarity index 99%
rename from sf_daq_broker/writer_format.py
rename to sf_daq_broker/writer/bsread_writer_format.py
index bd3fba7..3805700 100644
--- a/sf_daq_broker/writer_format.py
+++ b/sf_daq_broker/writer/bsread_writer_format.py
@@ -11,7 +11,7 @@ from sf_daq_broker import config
 _logger = logging.getLogger(__name__)
 
 
-class DataBufferH5Writer(object):
+class BsreadH5Writer(object):
     def __init__(self, output_file, parameters):
         self.output_file = output_file
         self.parameters = parameters
@@ -151,7 +151,7 @@ class DataBufferH5Writer(object):
         self.file.close()
 
 
-class CompactDataBufferH5Writer(DataBufferH5Writer):
+class CompactBsreadH5Writer(BsreadH5Writer):
 
     def _build_datasets_data(self, json_data):