diff --git a/src/fspp/CMakeLists.txt b/src/fspp/CMakeLists.txt
new file mode 100644
index 00000000..de732aa0
--- /dev/null
+++ b/src/fspp/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(fuse)
+add_subdirectory(impl)
diff --git a/src/fusepp/fs_interface/Device.h b/src/fspp/fs_interface/Device.h
similarity index 100%
rename from src/fusepp/fs_interface/Device.h
rename to src/fspp/fs_interface/Device.h
diff --git a/src/fusepp/fs_interface/Dir.h b/src/fspp/fs_interface/Dir.h
similarity index 93%
rename from src/fusepp/fs_interface/Dir.h
rename to src/fspp/fs_interface/Dir.h
index 35da3eea..81b010aa 100644
--- a/src/fusepp/fs_interface/Dir.h
+++ b/src/fspp/fs_interface/Dir.h
@@ -2,7 +2,7 @@
 #ifndef FSPP_DIR_H_
 #define FSPP_DIR_H_
 
-#include <fusepp/fs_interface/Node.h>
+#include <fspp/fs_interface/Node.h>
 #include <memory>
 #include <string>
 
diff --git a/src/fusepp/fs_interface/File.h b/src/fspp/fs_interface/File.h
similarity index 90%
rename from src/fusepp/fs_interface/File.h
rename to src/fspp/fs_interface/File.h
index 026498ce..31de9bc3 100644
--- a/src/fusepp/fs_interface/File.h
+++ b/src/fspp/fs_interface/File.h
@@ -2,7 +2,7 @@
 #ifndef FSPP_FILE_H_
 #define FSPP_FILE_H_
 
-#include <fusepp/fs_interface/Node.h>
+#include "Node.h"
 #include <memory>
 
 namespace fspp {
diff --git a/src/fusepp/fs_interface/Node.h b/src/fspp/fs_interface/Node.h
similarity index 100%
rename from src/fusepp/fs_interface/Node.h
rename to src/fspp/fs_interface/Node.h
diff --git a/src/fusepp/fs_interface/OpenFile.h b/src/fspp/fs_interface/OpenFile.h
similarity index 100%
rename from src/fusepp/fs_interface/OpenFile.h
rename to src/fspp/fs_interface/OpenFile.h
diff --git a/src/fspp/fuse/CMakeLists.txt b/src/fspp/fuse/CMakeLists.txt
new file mode 100644
index 00000000..194f5ba8
--- /dev/null
+++ b/src/fspp/fuse/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(fspp_fuse Fuse.cpp)
+
+target_link_libraries(fspp_fuse fuse fspp_impl)
diff --git a/src/fusepp/fusebindings/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
similarity index 99%
rename from src/fusepp/fusebindings/Fuse.cpp
rename to src/fspp/fuse/Fuse.cpp
index d973368b..3d29333c 100644
--- a/src/fusepp/fusebindings/Fuse.cpp
+++ b/src/fspp/fuse/Fuse.cpp
@@ -2,8 +2,8 @@
 #include <memory>
 #include <cassert>
 
-#include "fusepp/impl/FuseErrnoException.h"
-#include "fusepp/impl/FilesystemImpl.h"
+#include "fspp/impl/FuseErrnoException.h"
+#include "fspp/impl/FilesystemImpl.h"
 
 using std::unique_ptr;
 using std::make_unique;
diff --git a/src/fusepp/fusebindings/Fuse.h b/src/fspp/fuse/Fuse.h
similarity index 100%
rename from src/fusepp/fusebindings/Fuse.h
rename to src/fspp/fuse/Fuse.h
diff --git a/src/fusepp/fusebindings/params.h b/src/fspp/fuse/params.h
similarity index 100%
rename from src/fusepp/fusebindings/params.h
rename to src/fspp/fuse/params.h
diff --git a/src/fspp/impl/CMakeLists.txt b/src/fspp/impl/CMakeLists.txt
new file mode 100644
index 00000000..e0731c30
--- /dev/null
+++ b/src/fspp/impl/CMakeLists.txt
@@ -0,0 +1 @@
+add_library(fspp_impl FilesystemImpl.cpp FuseOpenFileList.cpp IdList.cpp FuseErrnoException.cpp)
diff --git a/src/fusepp/impl/FilesystemImpl.cpp b/src/fspp/impl/FilesystemImpl.cpp
similarity index 95%
rename from src/fusepp/impl/FilesystemImpl.cpp
rename to src/fspp/impl/FilesystemImpl.cpp
index e1881313..a6c4dd21 100644
--- a/src/fusepp/impl/FilesystemImpl.cpp
+++ b/src/fspp/impl/FilesystemImpl.cpp
@@ -2,14 +2,14 @@
 
 #include <memory>
 #include <fcntl.h>
-#include <fusepp/fs_interface/Device.h>
-#include <fusepp/fs_interface/Dir.h>
+#include <fspp/fs_interface/Device.h>
+#include <fspp/fs_interface/Dir.h>
 
 #include "FuseErrnoException.h"
-#include "fusepp/fs_interface/File.h"
+#include "fspp/fs_interface/File.h"
 
 
-#include "fusepp/utils/pointer.h"
+#include "fspp/utils/pointer.h"
 
 using namespace fspp;
 
diff --git a/src/fusepp/impl/FilesystemImpl.h b/src/fspp/impl/FilesystemImpl.h
similarity index 98%
rename from src/fusepp/impl/FilesystemImpl.h
rename to src/fspp/impl/FilesystemImpl.h
index be4824fd..d827ba82 100644
--- a/src/fusepp/impl/FilesystemImpl.h
+++ b/src/fspp/impl/FilesystemImpl.h
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 
-#include "fusepp/utils/macros.h"
+#include "fspp/utils/macros.h"
 
 namespace fspp {
 class Node;
diff --git a/src/fusepp/impl/FuseErrnoException.cpp b/src/fspp/impl/FuseErrnoException.cpp
similarity index 94%
rename from src/fusepp/impl/FuseErrnoException.cpp
rename to src/fspp/impl/FuseErrnoException.cpp
index 7a3bf55e..017af5cf 100644
--- a/src/fusepp/impl/FuseErrnoException.cpp
+++ b/src/fspp/impl/FuseErrnoException.cpp
@@ -21,4 +21,4 @@ int FuseErrnoException::getErrno() const {
   return _errno;
 }
 
-} /* namespace fusepp */
+} /* namespace fspp */
diff --git a/src/fusepp/impl/FuseErrnoException.h b/src/fspp/impl/FuseErrnoException.h
similarity index 100%
rename from src/fusepp/impl/FuseErrnoException.h
rename to src/fspp/impl/FuseErrnoException.h
diff --git a/src/fusepp/impl/FuseOpenFileList.cpp b/src/fspp/impl/FuseOpenFileList.cpp
similarity index 100%
rename from src/fusepp/impl/FuseOpenFileList.cpp
rename to src/fspp/impl/FuseOpenFileList.cpp
diff --git a/src/fusepp/impl/FuseOpenFileList.h b/src/fspp/impl/FuseOpenFileList.h
similarity index 88%
rename from src/fusepp/impl/FuseOpenFileList.h
rename to src/fspp/impl/FuseOpenFileList.h
index 4277b5a4..2d230e9f 100644
--- a/src/fusepp/impl/FuseOpenFileList.h
+++ b/src/fspp/impl/FuseOpenFileList.h
@@ -2,9 +2,9 @@
 #ifndef FSPP_IMPL_FUSEOPENFILELIST_H_
 #define FSPP_IMPL_FUSEOPENFILELIST_H_
 
-#include <fusepp/fs_interface/File.h>
-#include <fusepp/fs_interface/OpenFile.h>
-#include "fusepp/utils/macros.h"
+#include <fspp/fs_interface/File.h>
+#include <fspp/fs_interface/OpenFile.h>
+#include "fspp/utils/macros.h"
 #include "IdList.h"
 
 namespace fspp {
diff --git a/src/fusepp/impl/IdList.cpp b/src/fspp/impl/IdList.cpp
similarity index 100%
rename from src/fusepp/impl/IdList.cpp
rename to src/fspp/impl/IdList.cpp
diff --git a/src/fusepp/impl/IdList.h b/src/fspp/impl/IdList.h
similarity index 95%
rename from src/fusepp/impl/IdList.h
rename to src/fspp/impl/IdList.h
index 31be925f..c5aaa57f 100644
--- a/src/fusepp/impl/IdList.h
+++ b/src/fspp/impl/IdList.h
@@ -5,7 +5,7 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include "fusepp/utils/macros.h"
+#include "fspp/utils/macros.h"
 
 namespace fspp {
 
@@ -63,6 +63,6 @@ void IdList<Entry>::remove(int id) {
   _entries.erase(id);
 }
 
-} /* namespace fusepp */
+} /* namespace fspp */
 
 #endif /* FSPP_FUSE_IDLIST_H_ */
diff --git a/src/fusepp/utils/macros.h b/src/fspp/utils/macros.h
similarity index 100%
rename from src/fusepp/utils/macros.h
rename to src/fspp/utils/macros.h
diff --git a/src/fusepp/utils/pointer.h b/src/fspp/utils/pointer.h
similarity index 100%
rename from src/fusepp/utils/pointer.h
rename to src/fspp/utils/pointer.h
diff --git a/src/fusepp/CMakeLists.txt b/src/fusepp/CMakeLists.txt
deleted file mode 100644
index 3b92f95d..00000000
--- a/src/fusepp/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(fusebindings)
-add_subdirectory(impl)
diff --git a/src/fusepp/fusebindings/CMakeLists.txt b/src/fusepp/fusebindings/CMakeLists.txt
deleted file mode 100644
index 0acb4f61..00000000
--- a/src/fusepp/fusebindings/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_library(fusepp_fuse_bindings Fuse.cpp)
-
-target_link_libraries(fusepp_fuse_bindings fuse fusepp_impl)
diff --git a/src/fusepp/impl/CMakeLists.txt b/src/fusepp/impl/CMakeLists.txt
deleted file mode 100644
index 4d28ec72..00000000
--- a/src/fusepp/impl/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_library(fusepp_impl FilesystemImpl.cpp FuseOpenFileList.cpp IdList.cpp FuseErrnoException.cpp)