diff --git a/sf_bernina/BerninaFormat.cpp b/sf/BerninaFormat.cpp
similarity index 100%
rename from sf_bernina/BerninaFormat.cpp
rename to sf/BerninaFormat.cpp
diff --git a/sf_bernina/Makefile b/sf/Makefile
similarity index 76%
rename from sf_bernina/Makefile
rename to sf/Makefile
index 5c5aa38..1623d23 100644
--- a/sf_bernina/Makefile
+++ b/sf/Makefile
@@ -11,17 +11,17 @@ HEADERS = $(wildcard $(SRC_DIR)/*.hpp)
 SRCS = $(wildcard $(SRC_DIR)/*.cpp)
 OBJS = $(patsubst $(SRC_DIR)/%.cpp, $(OBJ_DIR)/%.o, $(SRCS))
 
-bernina_h5_writer: export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
-bernina_h5_writer: lib build_dirs $(OBJS)
-	$(CC) $(LDFLAGS) -o $(BIN_DIR)/bernina_h5_writer $(OBJS) $(LDFLAGS)
+sf_h5_writer: export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
+sf_h5_writer: lib build_dirs $(OBJS)
+	$(CC) $(LDFLAGS) -o $(BIN_DIR)/sf_h5_writer $(OBJS) $(LDFLAGS)
 
 lib:
 	$(MAKE) -C ../lib deploy
 
 debug: CFLAGS += -DDEBUG_OUTPUT -g
-debug: bernina_h5_writer
+debug: sf_h5_writer
 
-deploy: bernina_h5_writer
+deploy: sf_h5_writer
 	cp bin/* ${CONDA_PREFIX}/bin
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
diff --git a/sf_bernina/bernina_h5_writer.cpp b/sf/bernina_h5_writer.cpp
similarity index 100%
rename from sf_bernina/bernina_h5_writer.cpp
rename to sf/bernina_h5_writer.cpp
diff --git a/sf_bernina/conda-recipe/build.sh b/sf/conda-recipe/build.sh
similarity index 100%
rename from sf_bernina/conda-recipe/build.sh
rename to sf/conda-recipe/build.sh
diff --git a/sf_bernina/conda-recipe/meta.yaml b/sf/conda-recipe/meta.yaml
similarity index 100%
rename from sf_bernina/conda-recipe/meta.yaml
rename to sf/conda-recipe/meta.yaml