diff --git a/CMakeLists.fspp.txt b/CMakeLists.fspp.txt
deleted file mode 100644
index b91f472c..00000000
--- a/CMakeLists.fspp.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-=======
-INCLUDE(messmer/cmake/tools)
-
-# Actually create targets: EXEcutables and libraries.
-ADD_BII_TARGETS()
-
-ADD_BOOST(filesystem system thread chrono)
-
-ACTIVATE_CPP14()
-REQUIRE_GCC_VERSION(4.8)
-
-ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
-
-ENABLE_STYLE_WARNINGS()
-
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  IF(EXISTS "/usr/local/include/osxfuse")
-    TARGET_INCLUDE_DIRECTORIES(${BII_LIB_TARGET} PUBLIC /usr/local/include/osxfuse)
-    TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE osxfuse)
-  ELSE()
-    MESSAGE(FATAL_ERROR "Osxfuse not found. Please install osxfuse.")
-  ENDIF(EXISTS "/usr/local/include/osxfuse")
-ELSE(CMAKE_SYSTEM_NAME)
-  TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE fuse)
-ENDIF(CMAKE_SYSTEM_NAME)
-
-# You can safely delete lines from here...
-
-###############################################################################
-#      REFERENCE                                                              #
-###############################################################################
-#
-# This CMakeLists.txt file helps defining your block building and compiling
-# To learn more about the CMake use with biicode, visit http://docs.biicode.com/c++.html
-#
-# ----------------------------------------------------
-# NEW FEATURE! Include cmake files from remote blocks:
-# -----------------------------------------------------
-# Now you can handle cmake dependencies alike you do with c/c++:
-#
-#     INCLUDE(user/block/myrecipe) # include myrecipe.cmake from remote user/block
-#
-# > EXAMPLE: Include our recipes and activate C++11 in your block (http://www.biicode.com/biicode/cmake)
-#
-#     INCLUDE(biicode/cmake/tools) # Include tools.cmake file from "cmake" block from the "biicode" user
-#     ACTIVATE_CPP11(INTERFACE ${BII_BLOCK_TARGET})
-#
-#     Remember to run "bii find" to download out cmake tools file
-#
-# ---------------------
-# INIT_BIICODE_BLOCK()
-# ---------------------
-# This function creates several helper variables as ${BII_BLOCK_NAME} and ${BII_BLOCK_USER}
-# Also it loads variables from the cmake/bii_user_block_vars.cmake
-#     ${BII_LIB_SRC}          File list to create the library
-#     ${BII_LIB_TYPE}         Empty (default, STATIC most casess) STATIC or SHARED
-#     ${BII_LIB_DEPS}         Dependencies to other libraries (user2_block2, user3_blockX)
-#     ${BII_LIB_SYSTEM_HEADERS}  System linking requirements as windows.h, pthread.h, etc
-#
-# You can use or modify them here, for example, to add or remove files from targets based on OS
-# Or use typical cmake configurations done BEFORE defining targets. Examples:
-#     ADD_DEFINITIONS(-DFOO)
-#     FIND_PACKAGE(OpenGL QUIET)
-#     You can add INCLUDE_DIRECTORIES here too
-#
-# ---------------------
-# ADD_BIICODE_TARGETS()
-# ---------------------
-#
-# This function creates the following variables:
-#     ${BII_BLOCK_TARGET}  Interface (no files) target for convenient configuration of all
-#                          targets in this block, as the rest of targets always depend on it
-#                          has name in the form "user_block_interface"
-#     ${BII_LIB_TARGET}  Target library name, usually in the form "user_block". May not exist
-#                        if BII_LIB_SRC is empty
-#     ${BII_BLOCK_TARGETS} List of all targets defined in this block
-#     ${BII_BLOCK_EXES} List of executables targets defined in this block
-#     ${BII_exe_name_TARGET}: Executable target (e.g. ${BII_main_TARGET}. You can also use
-#                            directly the name of the executable target (e.g. user_block_main)
-#
-# > EXAMPLE: Add include directories to all targets of this block
-#
-#    TARGET_INCLUDE_DIRECTORIES(${BII_BLOCK_TARGET} INTERFACE myincludedir)
-#
-#    You can add private include directories to the Lib (if existing)
-#
-# > EXAMPLE: Link with pthread:
-#
-#    TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE pthread)
-#        or link against library:
-#    TARGET_LINK_LIBRARIES(${BII_LIB_TARGET} PUBLIC pthread)
-#        or directly use the library target name:
-#    TARGET_LINK_LIBRARIES(user_block PUBLIC pthread)
-#
-#    NOTE:  This can be also done adding pthread to ${BII_LIB_DEPS}
-#            BEFORE calling ADD_BIICODE_TARGETS()
-#
-# > EXAMPLE: how to activate C++11
-#
-#    IF(APPLE)
-#         TARGET_COMPILE_OPTIONS(${BII_BLOCK_TARGET} INTERFACE "-std=c++11 -stdlib=libc++")
-#    ELSEIF (WIN32 OR UNIX)
-#         TARGET_COMPILE_OPTIONS(${BII_BLOCK_TARGET} INTERFACE "-std=c++11")
-#    ENDIF(APPLE)
-#
-# > EXAMPLE: Set properties to target
-#
-#    SET_TARGET_PROPERTIES(${BII_BLOCK_TARGET} PROPERTIES COMPILE_DEFINITIONS "IOV_MAX=255")
-#
-
-
->>>>>>> fspp_develop
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81e07aae..1f30e5dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.0)
 
 include(utils.cmake)
 
+require_gcc_version(4.8)
+
 add_subdirectory(vendor)
+include_directories(vendor)
+
 add_subdirectory(src)
 add_subdirectory(test)
diff --git a/biicode.conf b/biicode.conf
deleted file mode 100644
index f72023a3..00000000
--- a/biicode.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# Biicode configuration file
-
-[requirements]
-	 google/gmock: 4
-	 google/gtest: 11
-	 messmer/cmake: 3
-	 messmer/cpp-utils: 9
-
-[parent]
-	messmer/fspp: 8
-[paths]
-    # Local directories to look for headers (within block)
-    # /
-    # include
-
-[dependencies]
-    # Manual adjust file implicit dependencies, add (+), remove (-), or overwrite (=)
-    # hello.h + hello_imp.cpp hello_imp2.cpp
-    # *.h + *.cpp
-    
-    test/main.cpp + test/*.cpp
-
-[mains]
-    # Manual adjust of files that define an executable
-    # !main.cpp  # Do not build executable from this file
-    # main2.cpp # Build it (it doesnt have a main() function, but maybe it includes it)
-
-[hooks]
-    # These are defined equal to [dependencies],files names matching bii*stage*hook.py
-    # will be launched as python scripts at stage = {post_process, clean}
-    # CMakeLists.txt + bii/my_post_process1_hook.py bii_clean_hook.py
-
-[includes]
-    # Mapping of include patterns to external blocks
-    # hello*.h: user3/depblock  # includes will be processed as user3/depblock/hello*.h
-
-[data]
-    # Manually define data files dependencies, that will be copied to bin for execution
-    # By default they are copied to bin/user/block/... which should be taken into account
-    # when loading from disk such data
-    # image.cpp + image.jpg  # code should write open("user/block/image.jpg")
-
-[tests]
-    test/*
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b60f025..56994ae3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1 +1,4 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
 add_subdirectory(cpp-utils)
+add_subdirectory(fspp)
\ No newline at end of file
diff --git a/src/cpp-utils/CMakeLists.txt b/src/cpp-utils/CMakeLists.txt
index 72ab5c2a..26a625ee 100644
--- a/src/cpp-utils/CMakeLists.txt
+++ b/src/cpp-utils/CMakeLists.txt
@@ -1,5 +1,3 @@
-include(CheckCXXCompilerFlag)
-
 project (cpp-utils)
 
 set(SOURCES
diff --git a/src/cpp-utils/crypto/kdf/Scrypt.h b/src/cpp-utils/crypto/kdf/Scrypt.h
index 6f7adadd..d77ef0e8 100644
--- a/src/cpp-utils/crypto/kdf/Scrypt.h
+++ b/src/cpp-utils/crypto/kdf/Scrypt.h
@@ -5,7 +5,7 @@
 #include "../../macros.h"
 #include "../../random/Random.h"
 extern "C" {
-    #include "../../../../vendor/scrypt-1.2.0/lib/crypto/crypto_scrypt.h"
+    #include <scrypt-1.2.0/lib/crypto/crypto_scrypt.h>
 }
 #include <stdexcept>
 #include "DerivedKey.h"
diff --git a/src/cpp-utils/logging/Logger.h b/src/cpp-utils/logging/Logger.h
index 3b7c269d..a6fa0e34 100644
--- a/src/cpp-utils/logging/Logger.h
+++ b/src/cpp-utils/logging/Logger.h
@@ -2,7 +2,7 @@
 #ifndef MESSMER_CPPUTILS_LOGGING_LOGGER_H
 #define MESSMER_CPPUTILS_LOGGING_LOGGER_H
 
-#include "../../../vendor/spdlog/spdlog.h"
+#include <spdlog/spdlog.h>
 #include "../macros.h"
 
 namespace cpputils {
diff --git a/src/fspp/CMakeLists.txt b/src/fspp/CMakeLists.txt
new file mode 100644
index 00000000..ed372912
--- /dev/null
+++ b/src/fspp/CMakeLists.txt
@@ -0,0 +1,32 @@
+project (fspp)
+
+set(SOURCES
+  impl/FilesystemImpl.cpp
+  impl/Profiler.cpp
+  fuse/Fuse.cpp
+)
+
+add_library(${PROJECT_NAME} STATIC ${SOURCES})
+
+# This is needed by boost thread
+#if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+#  target_link_libraries(${PROJECT_NAME} PRIVATE rt)
+#endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC _FILE_OFFSET_BITS=64)
+target_link_libraries(${PROJECT_NAME} PRIVATE cpp-utils)
+
+add_boost(${PROJECT_NAME} filesystem system thread chrono)
+enable_style_warnings(${PROJECT_NAME})
+activate_cpp14(${PROJECT_NAME})
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  if(EXISTS "/usr/local/include/osxfuse")
+    target_include_directories(${PROJECT_NAME} PRIVATE /usr/local/include/osxfuse)
+    target_link_libraries(${PROJECT_NAME} PRIVATE osxfuse)
+  else()
+    message(FATAL_ERROR "Osxfuse not found in /usr/local/include/osxfuse. Please install osxfuse.")
+  endif(EXISTS "/usr/local/include/osxfuse")
+else(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  target_link_libraries(${PROJECT_NAME} PRIVATE fuse)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/fs_interface/Device.h b/src/fspp/fs_interface/Device.h
similarity index 89%
rename from fs_interface/Device.h
rename to src/fspp/fs_interface/Device.h
index 35b3b4b5..50c3eadc 100644
--- a/fs_interface/Device.h
+++ b/src/fspp/fs_interface/Device.h
@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FSINTERFACE_DEVICE_H_
 
 #include <boost/filesystem.hpp>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <sys/statvfs.h>
 
 namespace fspp {
diff --git a/fs_interface/Dir.h b/src/fspp/fs_interface/Dir.h
similarity index 95%
rename from fs_interface/Dir.h
rename to src/fspp/fs_interface/Dir.h
index 35441497..338dcf2b 100644
--- a/fs_interface/Dir.h
+++ b/src/fspp/fs_interface/Dir.h
@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FSINTERFACE_DIR_H_
 
 #include "Node.h"
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <string>
 
 namespace fspp {
diff --git a/fs_interface/File.h b/src/fspp/fs_interface/File.h
similarity index 87%
rename from fs_interface/File.h
rename to src/fspp/fs_interface/File.h
index 1c29c9ba..74084303 100644
--- a/fs_interface/File.h
+++ b/src/fspp/fs_interface/File.h
@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FSINTERFACE_FILE_H_
 
 #include "Node.h"
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 namespace fspp {
 class Device;
diff --git a/fs_interface/Node.h b/src/fspp/fs_interface/Node.h
similarity index 100%
rename from fs_interface/Node.h
rename to src/fspp/fs_interface/Node.h
diff --git a/fs_interface/OpenFile.h b/src/fspp/fs_interface/OpenFile.h
similarity index 100%
rename from fs_interface/OpenFile.h
rename to src/fspp/fs_interface/OpenFile.h
diff --git a/fs_interface/Symlink.h b/src/fspp/fs_interface/Symlink.h
similarity index 86%
rename from fs_interface/Symlink.h
rename to src/fspp/fs_interface/Symlink.h
index 8d28860f..591e8a06 100644
--- a/fs_interface/Symlink.h
+++ b/src/fspp/fs_interface/Symlink.h
@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FSINTERFACE_SYMLINK_H_
 
 #include "Node.h"
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <string>
 
 namespace fspp {
diff --git a/fstest/FsTest.h b/src/fspp/fstest/FsTest.h
similarity index 100%
rename from fstest/FsTest.h
rename to src/fspp/fstest/FsTest.h
diff --git a/fstest/FsppDeviceTest.h b/src/fspp/fstest/FsppDeviceTest.h
similarity index 100%
rename from fstest/FsppDeviceTest.h
rename to src/fspp/fstest/FsppDeviceTest.h
diff --git a/fstest/FsppDirTest.h b/src/fspp/fstest/FsppDirTest.h
similarity index 100%
rename from fstest/FsppDirTest.h
rename to src/fspp/fstest/FsppDirTest.h
diff --git a/fstest/FsppFileTest.h b/src/fspp/fstest/FsppFileTest.h
similarity index 100%
rename from fstest/FsppFileTest.h
rename to src/fspp/fstest/FsppFileTest.h
diff --git a/fstest/FsppOpenFileTest.h b/src/fspp/fstest/FsppOpenFileTest.h
similarity index 100%
rename from fstest/FsppOpenFileTest.h
rename to src/fspp/fstest/FsppOpenFileTest.h
diff --git a/fstest/FsppSymlinkTest.h b/src/fspp/fstest/FsppSymlinkTest.h
similarity index 100%
rename from fstest/FsppSymlinkTest.h
rename to src/fspp/fstest/FsppSymlinkTest.h
diff --git a/fstest/testutils/FileSystemTest.h b/src/fspp/fstest/testutils/FileSystemTest.h
similarity index 92%
rename from fstest/testutils/FileSystemTest.h
rename to src/fspp/fstest/testutils/FileSystemTest.h
index b60d5c4e..f8b03a98 100644
--- a/fstest/testutils/FileSystemTest.h
+++ b/src/fspp/fstest/testutils/FileSystemTest.h
@@ -2,11 +2,11 @@
 #ifndef MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_
 
-#include <google/gtest/gtest.h>
+#include <gtest/gtest.h>
 #include <type_traits>
 #include <boost/static_assert.hpp>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
-#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
+#include <cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
 
 #include "../../fs_interface/Device.h"
 #include "../../fs_interface/Dir.h"
diff --git a/fstest/testutils/FileTest.h b/src/fspp/fstest/testutils/FileTest.h
similarity index 94%
rename from fstest/testutils/FileTest.h
rename to src/fspp/fstest/testutils/FileTest.h
index 11c489ad..07f448aa 100644
--- a/fstest/testutils/FileTest.h
+++ b/src/fspp/fstest/testutils/FileTest.h
@@ -3,8 +3,8 @@
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILETEST_H_
 
 #include "FileSystemTest.h"
-#include <messmer/cpp-utils/data/Data.h>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/data/Data.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 template<class ConcreteFileSystemTestFixture>
 class FileTest: public FileSystemTest<ConcreteFileSystemTestFixture> {
diff --git a/fuse/Filesystem.h b/src/fspp/fuse/Filesystem.h
similarity index 98%
rename from fuse/Filesystem.h
rename to src/fspp/fuse/Filesystem.h
index c2676ddf..770cda6f 100644
--- a/fuse/Filesystem.h
+++ b/src/fspp/fuse/Filesystem.h
@@ -3,7 +3,7 @@
 #define MESSMER_FSPP_FUSE_FILESYSTEM_H_
 
 #include <boost/filesystem.hpp>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include "../fs_interface/Dir.h"
diff --git a/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
similarity index 99%
rename from fuse/Fuse.cpp
rename to src/fspp/fuse/Fuse.cpp
index cc3dc8ec..68c07198 100644
--- a/fuse/Fuse.cpp
+++ b/src/fspp/fuse/Fuse.cpp
@@ -5,8 +5,8 @@
 #include "FuseErrnoException.h"
 #include "Filesystem.h"
 #include <iostream>
-#include <messmer/cpp-utils/assert/assert.h>
-#include <messmer/cpp-utils/logging/logging.h>
+#include <cpp-utils/assert/assert.h>
+#include <cpp-utils/logging/logging.h>
 #include <csignal>
 
 using std::vector;
diff --git a/fuse/Fuse.h b/src/fspp/fuse/Fuse.h
similarity index 98%
rename from fuse/Fuse.h
rename to src/fspp/fuse/Fuse.h
index 5b7fc0ce..6c62f9d4 100644
--- a/fuse/Fuse.h
+++ b/src/fspp/fuse/Fuse.h
@@ -8,7 +8,7 @@
 #include <vector>
 #include <sys/stat.h>
 #include <boost/filesystem.hpp>
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 
 namespace fspp {
 class Device;
diff --git a/fuse/FuseErrnoException.h b/src/fspp/fuse/FuseErrnoException.h
similarity index 93%
rename from fuse/FuseErrnoException.h
rename to src/fspp/fuse/FuseErrnoException.h
index b0b0faa8..c100a8c4 100644
--- a/fuse/FuseErrnoException.h
+++ b/src/fspp/fuse/FuseErrnoException.h
@@ -4,7 +4,7 @@
 
 #include <stdexcept>
 #include <errno.h>
-#include <messmer/cpp-utils/assert/assert.h>
+#include <cpp-utils/assert/assert.h>
 
 namespace fspp {
 namespace fuse{
diff --git a/fuse/params.h b/src/fspp/fuse/params.h
similarity index 100%
rename from fuse/params.h
rename to src/fspp/fuse/params.h
diff --git a/impl/FilesystemImpl.cpp b/src/fspp/impl/FilesystemImpl.cpp
similarity index 99%
rename from impl/FilesystemImpl.cpp
rename to src/fspp/impl/FilesystemImpl.cpp
index b975b7d2..1be269de 100644
--- a/impl/FilesystemImpl.cpp
+++ b/src/fspp/impl/FilesystemImpl.cpp
@@ -8,8 +8,8 @@
 #include "../fuse/FuseErrnoException.h"
 #include "../fs_interface/File.h"
 
-#include <messmer/cpp-utils/logging/logging.h>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/logging/logging.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <sstream>
 
 using namespace fspp;
diff --git a/impl/FilesystemImpl.h b/src/fspp/impl/FilesystemImpl.h
similarity index 98%
rename from impl/FilesystemImpl.h
rename to src/fspp/impl/FilesystemImpl.h
index 052abe32..8af1fab1 100644
--- a/impl/FilesystemImpl.h
+++ b/src/fspp/impl/FilesystemImpl.h
@@ -5,7 +5,7 @@
 #include "FuseOpenFileList.h"
 #include "../fuse/Filesystem.h"
 
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 #include <atomic>
 
 //Remove this line if you don't want profiling
diff --git a/impl/FuseOpenFileList.h b/src/fspp/impl/FuseOpenFileList.h
similarity index 96%
rename from impl/FuseOpenFileList.h
rename to src/fspp/impl/FuseOpenFileList.h
index ef97f019..ec1d1d18 100644
--- a/impl/FuseOpenFileList.h
+++ b/src/fspp/impl/FuseOpenFileList.h
@@ -4,7 +4,7 @@
 
 #include "../fs_interface/File.h"
 #include "../fs_interface/OpenFile.h"
-#include "messmer/cpp-utils/macros.h"
+#include <cpp-utils/macros.h>
 #include "IdList.h"
 
 namespace fspp {
diff --git a/impl/IdList.h b/src/fspp/impl/IdList.h
similarity index 96%
rename from impl/IdList.h
rename to src/fspp/impl/IdList.h
index 0a8f196e..41c9308e 100644
--- a/impl/IdList.h
+++ b/src/fspp/impl/IdList.h
@@ -5,7 +5,7 @@
 #include <map>
 #include <mutex>
 #include <stdexcept>
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
 namespace fspp {
 
diff --git a/impl/Profiler.cpp b/src/fspp/impl/Profiler.cpp
similarity index 100%
rename from impl/Profiler.cpp
rename to src/fspp/impl/Profiler.cpp
diff --git a/impl/Profiler.h b/src/fspp/impl/Profiler.h
similarity index 96%
rename from impl/Profiler.h
rename to src/fspp/impl/Profiler.h
index 0bf6d838..66282714 100644
--- a/impl/Profiler.h
+++ b/src/fspp/impl/Profiler.h
@@ -4,7 +4,7 @@
 
 #include <atomic>
 #include <chrono>
-#include <messmer/cpp-utils/macros.h>
+#include <cpp-utils/macros.h>
 
 namespace fspp {
     class Profiler final {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b39fe26b..2293be09 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,4 +2,7 @@ enable_testing()
 include_directories(SYSTEM ${gtest_INCLUDE_DIRS}/include SYSTEM ${gmock_INCLUDE_DIRS}/include)
 link_libraries(gtest gmock gmock_main)
 
-add_subdirectory(cpp-utils)
\ No newline at end of file
+include_directories(../src)
+
+add_subdirectory(cpp-utils)
+add_subdirectory(fspp)
\ No newline at end of file
diff --git a/test/cpp-utils/EitherIncludeTest.cpp b/test/cpp-utils/EitherIncludeTest.cpp
index d8355891..5d3dd7b0 100644
--- a/test/cpp-utils/EitherIncludeTest.cpp
+++ b/test/cpp-utils/EitherIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../src/cpp-utils/either.h"
+#include "cpp-utils/either.h"
 
 //Test that either can be included without needing additional dependencies
diff --git a/test/cpp-utils/EitherTest.cpp b/test/cpp-utils/EitherTest.cpp
index 094e7cfe..e5555318 100644
--- a/test/cpp-utils/EitherTest.cpp
+++ b/test/cpp-utils/EitherTest.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 #include <boost/optional/optional_io.hpp>
-#include "../../src/cpp-utils/either.h"
-#include "../../src/cpp-utils/macros.h"
+#include "cpp-utils/either.h"
+#include "cpp-utils/macros.h"
 #include <sstream>
 
 //TODO Go through all test cases and think about whether it makes sense to add the same test case but with primitive types.
diff --git a/test/cpp-utils/MacrosIncludeTest.cpp b/test/cpp-utils/MacrosIncludeTest.cpp
index 4a181d69..6e16a15d 100644
--- a/test/cpp-utils/MacrosIncludeTest.cpp
+++ b/test/cpp-utils/MacrosIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../src/cpp-utils/macros.h"
+#include "cpp-utils/macros.h"
 
 // Test that macros.h can be included without needing additional dependencies
diff --git a/test/cpp-utils/assert/assert_debug_test.cpp b/test/cpp-utils/assert/assert_debug_test.cpp
index 787830b8..7da2627e 100644
--- a/test/cpp-utils/assert/assert_debug_test.cpp
+++ b/test/cpp-utils/assert/assert_debug_test.cpp
@@ -3,7 +3,7 @@
 
 //Include the ASSERT macro for a debug build
 #undef NDEBUG
-#include "../../../src/cpp-utils/assert/assert.h"
+#include "cpp-utils/assert/assert.h"
 
 using testing::MatchesRegex;
 
diff --git a/test/cpp-utils/assert/assert_include_test.cpp b/test/cpp-utils/assert/assert_include_test.cpp
index 3a85c2dc..b7dbf23a 100644
--- a/test/cpp-utils/assert/assert_include_test.cpp
+++ b/test/cpp-utils/assert/assert_include_test.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/assert/assert.h"
+#include "cpp-utils/assert/assert.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/assert/assert_release_test.cpp b/test/cpp-utils/assert/assert_release_test.cpp
index f67769a1..05ef87f6 100644
--- a/test/cpp-utils/assert/assert_release_test.cpp
+++ b/test/cpp-utils/assert/assert_release_test.cpp
@@ -3,7 +3,7 @@
 
 //Include the ASSERT macro for a release build
 #define NDEBUG
-#include "../../../src/cpp-utils/assert/assert.h"
+#include "cpp-utils/assert/assert.h"
 
 using testing::MatchesRegex;
 
diff --git a/test/cpp-utils/assert/backtrace_include_test.cpp b/test/cpp-utils/assert/backtrace_include_test.cpp
index be2f53ae..fc2e6226 100644
--- a/test/cpp-utils/assert/backtrace_include_test.cpp
+++ b/test/cpp-utils/assert/backtrace_include_test.cpp
@@ -1,4 +1,4 @@
-#include "../../../src/cpp-utils/assert/backtrace.h"
+#include "cpp-utils/assert/backtrace.h"
 
 // Test the header can be included without needing additional dependencies
 
diff --git a/test/cpp-utils/crypto/kdf/DerivedKeyConfigTest.cpp b/test/cpp-utils/crypto/kdf/DerivedKeyConfigTest.cpp
index 6e268b92..a8927500 100644
--- a/test/cpp-utils/crypto/kdf/DerivedKeyConfigTest.cpp
+++ b/test/cpp-utils/crypto/kdf/DerivedKeyConfigTest.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include "../../../../src/cpp-utils/crypto/kdf/DerivedKeyConfig.h"
-#include "../../../../src/cpp-utils/data/DataFixture.h"
+#include "cpp-utils/crypto/kdf/DerivedKeyConfig.h"
+#include "cpp-utils/data/DataFixture.h"
 #include <sstream>
 
 using namespace cpputils;
diff --git a/test/cpp-utils/crypto/kdf/DerivedKeyTest.cpp b/test/cpp-utils/crypto/kdf/DerivedKeyTest.cpp
index 20522148..c04ee187 100644
--- a/test/cpp-utils/crypto/kdf/DerivedKeyTest.cpp
+++ b/test/cpp-utils/crypto/kdf/DerivedKeyTest.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include "../../../../src/cpp-utils/crypto/kdf/DerivedKey.h"
-#include "../../../../src/cpp-utils/data/DataFixture.h"
+#include "cpp-utils/crypto/kdf/DerivedKey.h"
+#include "cpp-utils/data/DataFixture.h"
 
 using namespace cpputils;
 
diff --git a/test/cpp-utils/crypto/kdf/SCryptTest.cpp b/test/cpp-utils/crypto/kdf/SCryptTest.cpp
index f815fce0..ae12678e 100644
--- a/test/cpp-utils/crypto/kdf/SCryptTest.cpp
+++ b/test/cpp-utils/crypto/kdf/SCryptTest.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "../../../../src/cpp-utils/crypto/kdf/Scrypt.h"
+#include "cpp-utils/crypto/kdf/Scrypt.h"
 
 using namespace cpputils;
 
diff --git a/test/cpp-utils/crypto/symmetric/CipherTest.cpp b/test/cpp-utils/crypto/symmetric/CipherTest.cpp
index 7da67916..aa3b2e8c 100644
--- a/test/cpp-utils/crypto/symmetric/CipherTest.cpp
+++ b/test/cpp-utils/crypto/symmetric/CipherTest.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
-#include "../../../../src/cpp-utils/crypto/symmetric/Cipher.h"
-#include "../../../../src/cpp-utils/crypto/symmetric/ciphers.h"
+#include "cpp-utils/crypto/symmetric/Cipher.h"
+#include "cpp-utils/crypto/symmetric/ciphers.h"
 #include "testutils/FakeAuthenticatedCipher.h"
 
-#include "../../../../src/cpp-utils/data/DataFixture.h"
-#include "../../../../src/cpp-utils/data/Data.h"
+#include "cpp-utils/data/DataFixture.h"
+#include "cpp-utils/data/Data.h"
 #include <boost/optional/optional_io.hpp>
 
 using namespace cpputils;
diff --git a/test/cpp-utils/crypto/symmetric/testutils/FakeAuthenticatedCipher.h b/test/cpp-utils/crypto/symmetric/testutils/FakeAuthenticatedCipher.h
index 45d889ba..2aa9b8fc 100644
--- a/test/cpp-utils/crypto/symmetric/testutils/FakeAuthenticatedCipher.h
+++ b/test/cpp-utils/crypto/symmetric/testutils/FakeAuthenticatedCipher.h
@@ -2,10 +2,10 @@
 #ifndef MESSMER_CPPUTILS_TEST_CRYPTO_SYMMETRIC_TESTUTILS_FAKEAUTHENTICATEDCIPHER_H_
 #define MESSMER_CPPUTILS_TEST_CRYPTO_SYMMETRIC_TESTUTILS_FAKEAUTHENTICATEDCIPHER_H_
 
-#include "../../../../../src/cpp-utils/crypto/symmetric/Cipher.h"
-#include "../../../../../src/cpp-utils/data/FixedSizeData.h"
-#include "../../../../../src/cpp-utils/data/Data.h"
-#include "../../../../../src/cpp-utils/random/RandomGenerator.h"
+#include "cpp-utils/crypto/symmetric/Cipher.h"
+#include "cpp-utils/data/FixedSizeData.h"
+#include "cpp-utils/data/Data.h"
+#include "cpp-utils/random/RandomGenerator.h"
 
 namespace cpputils {
 
diff --git a/test/cpp-utils/data/DataFixtureIncludeTest.cpp b/test/cpp-utils/data/DataFixtureIncludeTest.cpp
index 318deff3..e30657ac 100644
--- a/test/cpp-utils/data/DataFixtureIncludeTest.cpp
+++ b/test/cpp-utils/data/DataFixtureIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/data/DataFixture.h"
+#include "cpp-utils/data/DataFixture.h"
 
 // Test the header can be included without needing additional dependencies
\ No newline at end of file
diff --git a/test/cpp-utils/data/DataFixtureTest.cpp b/test/cpp-utils/data/DataFixtureTest.cpp
index 6a982cda..5029a3ff 100644
--- a/test/cpp-utils/data/DataFixtureTest.cpp
+++ b/test/cpp-utils/data/DataFixtureTest.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include "../../../src/cpp-utils/data/Data.h"
-#include "../../../src/cpp-utils/data/DataFixture.h"
+#include "cpp-utils/data/Data.h"
+#include "cpp-utils/data/DataFixture.h"
 
 using ::testing::Test;
 using ::testing::WithParamInterface;
diff --git a/test/cpp-utils/data/DataIncludeTest.cpp b/test/cpp-utils/data/DataIncludeTest.cpp
index a0e97317..f9230be7 100644
--- a/test/cpp-utils/data/DataIncludeTest.cpp
+++ b/test/cpp-utils/data/DataIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/data/Data.h"
+#include "cpp-utils/data/Data.h"
 
 // Test the header can be included without needing additional dependencies
\ No newline at end of file
diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp
index e8e23d76..6f9df070 100644
--- a/test/cpp-utils/data/DataTest.cpp
+++ b/test/cpp-utils/data/DataTest.cpp
@@ -1,8 +1,8 @@
-#include "../../../src/cpp-utils/data/DataFixture.h"
-#include "../../../src/cpp-utils/data/Data.h"
+#include "cpp-utils/data/DataFixture.h"
+#include "cpp-utils/data/Data.h"
 #include <gtest/gtest.h>
 
-#include "../../../src/cpp-utils/tempfile/TempFile.h"
+#include "cpp-utils/tempfile/TempFile.h"
 
 #include <fstream>
 
diff --git a/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp b/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp
index f69ef1d9..817e1c6f 100644
--- a/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp
+++ b/test/cpp-utils/data/FixedSizeDataIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/data/FixedSizeData.h"
+#include "cpp-utils/data/FixedSizeData.h"
 
 // Test the header can be included without needing additional dependencies
\ No newline at end of file
diff --git a/test/cpp-utils/data/FixedSizeDataTest.cpp b/test/cpp-utils/data/FixedSizeDataTest.cpp
index 533a0ee8..dbbb554f 100644
--- a/test/cpp-utils/data/FixedSizeDataTest.cpp
+++ b/test/cpp-utils/data/FixedSizeDataTest.cpp
@@ -1,6 +1,6 @@
-#include "../../../src/cpp-utils/data/DataFixture.h"
-#include "../../../src/cpp-utils/data/FixedSizeData.h"
-#include "../../../src/cpp-utils/data/Data.h"
+#include "cpp-utils/data/DataFixture.h"
+#include "cpp-utils/data/FixedSizeData.h"
+#include "cpp-utils/data/Data.h"
 #include <gtest/gtest.h>
 
 
diff --git a/test/cpp-utils/io/ConsoleIncludeTest.cpp b/test/cpp-utils/io/ConsoleIncludeTest.cpp
index c5afe80b..7f24a430 100644
--- a/test/cpp-utils/io/ConsoleIncludeTest.cpp
+++ b/test/cpp-utils/io/ConsoleIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/io/Console.h"
+#include "cpp-utils/io/Console.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/io/ConsoleTest.h b/test/cpp-utils/io/ConsoleTest.h
index 993d3ed5..303b0b09 100644
--- a/test/cpp-utils/io/ConsoleTest.h
+++ b/test/cpp-utils/io/ConsoleTest.h
@@ -4,11 +4,11 @@
 
 #include <gtest/gtest.h>
 
-#include "../../../src/cpp-utils/io/Console.h"
+#include "cpp-utils/io/Console.h"
 
 #include <future>
 #include <thread>
-#include "../../../src/cpp-utils/io/pipestream.h"
+#include "cpp-utils/io/pipestream.h"
 
 class ConsoleThread {
 public:
diff --git a/test/cpp-utils/lock/ConditionBarrierIncludeTest.cpp b/test/cpp-utils/lock/ConditionBarrierIncludeTest.cpp
index 87a7ac5c..eb8eb018 100644
--- a/test/cpp-utils/lock/ConditionBarrierIncludeTest.cpp
+++ b/test/cpp-utils/lock/ConditionBarrierIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/lock/ConditionBarrier.h"
+#include "cpp-utils/lock/ConditionBarrier.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/lock/LockPoolIncludeTest.cpp b/test/cpp-utils/lock/LockPoolIncludeTest.cpp
index 31d1406d..2b333e36 100644
--- a/test/cpp-utils/lock/LockPoolIncludeTest.cpp
+++ b/test/cpp-utils/lock/LockPoolIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/lock/LockPool.h"
+#include "cpp-utils/lock/LockPool.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/lock/MutexPoolLockIncludeTest.cpp b/test/cpp-utils/lock/MutexPoolLockIncludeTest.cpp
index 35e8eb07..6fe2c90d 100644
--- a/test/cpp-utils/lock/MutexPoolLockIncludeTest.cpp
+++ b/test/cpp-utils/lock/MutexPoolLockIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/lock/MutexPoolLock.h"
+#include "cpp-utils/lock/MutexPoolLock.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/logging/LoggerIncludeTest.cpp b/test/cpp-utils/logging/LoggerIncludeTest.cpp
index 7b07ca4c..0f2fc1e5 100644
--- a/test/cpp-utils/logging/LoggerIncludeTest.cpp
+++ b/test/cpp-utils/logging/LoggerIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/logging/Logger.h"
+#include "cpp-utils/logging/Logger.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/logging/LoggingIncludeTest.cpp b/test/cpp-utils/logging/LoggingIncludeTest.cpp
index 9300fe80..0cdeee02 100644
--- a/test/cpp-utils/logging/LoggingIncludeTest.cpp
+++ b/test/cpp-utils/logging/LoggingIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/logging/logging.h"
+#include "cpp-utils/logging/logging.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/logging/testutils/LoggingTest.h b/test/cpp-utils/logging/testutils/LoggingTest.h
index 5c8f5269..42d0a593 100644
--- a/test/cpp-utils/logging/testutils/LoggingTest.h
+++ b/test/cpp-utils/logging/testutils/LoggingTest.h
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include "../../../../src/cpp-utils/logging/logging.h"
+#include "cpp-utils/logging/logging.h"
 
 class MockLogger final {
 public:
diff --git a/test/cpp-utils/network/CurlHttpClientTest.cpp b/test/cpp-utils/network/CurlHttpClientTest.cpp
index 54abbdc9..cccac537 100644
--- a/test/cpp-utils/network/CurlHttpClientTest.cpp
+++ b/test/cpp-utils/network/CurlHttpClientTest.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include "../../../src/cpp-utils/network/CurlHttpClient.h"
-#include "../../../src/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
+#include "cpp-utils/network/CurlHttpClient.h"
+#include "cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
 
 using std::string;
 using boost::none;
diff --git a/test/cpp-utils/network/FakeHttpClientTest.cpp b/test/cpp-utils/network/FakeHttpClientTest.cpp
index 1c69f073..be052838 100644
--- a/test/cpp-utils/network/FakeHttpClientTest.cpp
+++ b/test/cpp-utils/network/FakeHttpClientTest.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include "../../../src/cpp-utils/network/FakeHttpClient.h"
-#include "../../../src/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
+#include "cpp-utils/network/FakeHttpClient.h"
+#include "cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
 
 using boost::none;
 
diff --git a/test/cpp-utils/pointer/cast_include_test.cpp b/test/cpp-utils/pointer/cast_include_test.cpp
index ad7a24e0..362558b5 100644
--- a/test/cpp-utils/pointer/cast_include_test.cpp
+++ b/test/cpp-utils/pointer/cast_include_test.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/pointer/cast.h"
+#include "cpp-utils/pointer/cast.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/pointer/cast_test.cpp b/test/cpp-utils/pointer/cast_test.cpp
index b2aa220e..ec2eeb9a 100644
--- a/test/cpp-utils/pointer/cast_test.cpp
+++ b/test/cpp-utils/pointer/cast_test.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include "../../../src/cpp-utils/pointer/cast.h"
-#include "../../../src/cpp-utils/pointer/unique_ref.h"
-#include "../../../src/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
+#include "cpp-utils/pointer/cast.h"
+#include "cpp-utils/pointer/unique_ref.h"
+#include "cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
 
 //TODO There is a lot of duplication here, because each test case is there twice - once for unique_ptr, once for unique_ref. Remove redundancy by using generic test cases.
 //TODO Then also move the unique_ref related test cases there - cast_test.cpp should only contain the unique_ptr related ones.
diff --git a/test/cpp-utils/pointer/optional_ownership_ptr_include_test.cpp b/test/cpp-utils/pointer/optional_ownership_ptr_include_test.cpp
index dd6a4dfa..3c28e29d 100644
--- a/test/cpp-utils/pointer/optional_ownership_ptr_include_test.cpp
+++ b/test/cpp-utils/pointer/optional_ownership_ptr_include_test.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/pointer/optional_ownership_ptr.h"
+#include "cpp-utils/pointer/optional_ownership_ptr.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/pointer/optional_ownership_ptr_test.cpp b/test/cpp-utils/pointer/optional_ownership_ptr_test.cpp
index c6950cc2..f8e513b2 100644
--- a/test/cpp-utils/pointer/optional_ownership_ptr_test.cpp
+++ b/test/cpp-utils/pointer/optional_ownership_ptr_test.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
-#include "../../../src/cpp-utils/pointer/optional_ownership_ptr.h"
-#include "../../../src/cpp-utils/macros.h"
+#include "cpp-utils/pointer/optional_ownership_ptr.h"
+#include "cpp-utils/macros.h"
 
 using std::unique_ptr;
 using std::function;
diff --git a/test/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround_include_test.cpp b/test/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround_include_test.cpp
index 3aa6f9c9..a8612a88 100644
--- a/test/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround_include_test.cpp
+++ b/test/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround_include_test.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
+#include "cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/pointer/unique_ref_include_test.cpp b/test/cpp-utils/pointer/unique_ref_include_test.cpp
index 5679f675..65342d39 100644
--- a/test/cpp-utils/pointer/unique_ref_include_test.cpp
+++ b/test/cpp-utils/pointer/unique_ref_include_test.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/pointer/unique_ref.h"
+#include "cpp-utils/pointer/unique_ref.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/pointer/unique_ref_test.cpp b/test/cpp-utils/pointer/unique_ref_test.cpp
index 88e0ab97..53eb066e 100644
--- a/test/cpp-utils/pointer/unique_ref_test.cpp
+++ b/test/cpp-utils/pointer/unique_ref_test.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "../../../src/cpp-utils/pointer/unique_ref.h"
+#include "cpp-utils/pointer/unique_ref.h"
 #include <vector>
 #include <set>
 #include <map>
diff --git a/test/cpp-utils/process/daemonize_include_test.cpp b/test/cpp-utils/process/daemonize_include_test.cpp
index 3074d294..f851c992 100644
--- a/test/cpp-utils/process/daemonize_include_test.cpp
+++ b/test/cpp-utils/process/daemonize_include_test.cpp
@@ -1,4 +1,4 @@
-#include "../../../src/cpp-utils/process/daemonize.h"
+#include "cpp-utils/process/daemonize.h"
 
 // Test the header can be included without needing additional dependencies
 
diff --git a/test/cpp-utils/process/subprocess_include_test.cpp b/test/cpp-utils/process/subprocess_include_test.cpp
index 9d412eb7..186d3ce2 100644
--- a/test/cpp-utils/process/subprocess_include_test.cpp
+++ b/test/cpp-utils/process/subprocess_include_test.cpp
@@ -1,4 +1,4 @@
-#include "../../../src/cpp-utils/process/subprocess.h"
+#include "cpp-utils/process/subprocess.h"
 
 // Test the header can be included without needing additional dependencies
 
diff --git a/test/cpp-utils/random/RandomIncludeTest.cpp b/test/cpp-utils/random/RandomIncludeTest.cpp
index 3c69cab5..6a2e159c 100644
--- a/test/cpp-utils/random/RandomIncludeTest.cpp
+++ b/test/cpp-utils/random/RandomIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/random/Random.h"
+#include "cpp-utils/random/Random.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/tempfile/TempDirIncludeTest.cpp b/test/cpp-utils/tempfile/TempDirIncludeTest.cpp
index 75783fd1..43262566 100644
--- a/test/cpp-utils/tempfile/TempDirIncludeTest.cpp
+++ b/test/cpp-utils/tempfile/TempDirIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/tempfile/TempDir.h"
+#include "cpp-utils/tempfile/TempDir.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/tempfile/TempDirTest.cpp b/test/cpp-utils/tempfile/TempDirTest.cpp
index 417dfbfc..39cecde8 100644
--- a/test/cpp-utils/tempfile/TempDirTest.cpp
+++ b/test/cpp-utils/tempfile/TempDirTest.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../../../src/cpp-utils/tempfile/TempDir.h"
+#include "cpp-utils/tempfile/TempDir.h"
 
 #include <fstream>
 
diff --git a/test/cpp-utils/tempfile/TempFileIncludeTest.cpp b/test/cpp-utils/tempfile/TempFileIncludeTest.cpp
index 75f3f9d8..63ded6b2 100644
--- a/test/cpp-utils/tempfile/TempFileIncludeTest.cpp
+++ b/test/cpp-utils/tempfile/TempFileIncludeTest.cpp
@@ -1,3 +1,3 @@
-#include "../../../src/cpp-utils/tempfile/TempFile.h"
+#include "cpp-utils/tempfile/TempFile.h"
 
 // Test the header can be included without needing additional dependencies
diff --git a/test/cpp-utils/tempfile/TempFileTest.cpp b/test/cpp-utils/tempfile/TempFileTest.cpp
index c3a1959c..7fad6206 100644
--- a/test/cpp-utils/tempfile/TempFileTest.cpp
+++ b/test/cpp-utils/tempfile/TempFileTest.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include "../../../src/cpp-utils/tempfile/TempFile.h"
-#include "../../../src/cpp-utils/tempfile/TempDir.h"
+#include "cpp-utils/tempfile/TempFile.h"
+#include "cpp-utils/tempfile/TempDir.h"
 
 #include <fstream>
 
diff --git a/test/fspp/CMakeLists.txt b/test/fspp/CMakeLists.txt
new file mode 100644
index 00000000..65c9fa63
--- /dev/null
+++ b/test/fspp/CMakeLists.txt
@@ -0,0 +1,110 @@
+project (fspp-test)
+
+set(SOURCES
+    testutils/FuseTest.cpp
+    testutils/FuseThread.cpp
+    testutils/InMemoryFile.cpp
+    impl/FuseOpenFileListTest.cpp
+    impl/IdListTest.cpp
+    fuse/lstat/FuseLstatReturnUidTest.cpp
+    fuse/lstat/testutils/FuseLstatTest.cpp
+    fuse/lstat/FuseLstatReturnCtimeTest.cpp
+    fuse/lstat/FuseLstatReturnGidTest.cpp
+    fuse/lstat/FuseLstatPathParameterTest.cpp
+    fuse/lstat/FuseLstatReturnNlinkTest.cpp
+    fuse/lstat/FuseLstatReturnModeTest.cpp
+    fuse/lstat/FuseLstatReturnAtimeTest.cpp
+    fuse/lstat/FuseLstatErrorTest.cpp
+    fuse/lstat/FuseLstatReturnMtimeTest.cpp
+    fuse/lstat/FuseLstatReturnSizeTest.cpp
+    fuse/read/FuseReadFileDescriptorTest.cpp
+    fuse/read/testutils/FuseReadTest.cpp
+    fuse/read/FuseReadOverflowTest.cpp
+    fuse/read/FuseReadErrorTest.cpp
+    fuse/read/FuseReadReturnedDataTest.cpp
+    fuse/flush/testutils/FuseFlushTest.cpp
+    fuse/flush/FuseFlushErrorTest.cpp
+    fuse/flush/FuseFlushFileDescriptorTest.cpp
+    fuse/rename/testutils/FuseRenameTest.cpp
+    fuse/rename/FuseRenameErrorTest.cpp
+    fuse/rename/FuseRenameFilenameTest.cpp
+    fuse/utimens/testutils/FuseUtimensTest.cpp
+    fuse/utimens/FuseUtimensErrorTest.cpp
+    fuse/utimens/FuseUtimensFilenameTest.cpp
+    fuse/utimens/FuseUtimensTimeParameterTest.cpp
+    fuse/unlink/testutils/FuseUnlinkTest.cpp
+    fuse/unlink/FuseUnlinkErrorTest.cpp
+    fuse/unlink/FuseUnlinkFilenameTest.cpp
+    fuse/ftruncate/testutils/FuseFTruncateTest.cpp
+    fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp
+    fuse/ftruncate/FuseFTruncateSizeTest.cpp
+    fuse/ftruncate/FuseFTruncateErrorTest.cpp
+    fuse/fstat/testutils/FuseFstatTest.cpp
+    fuse/fstat/FuseFstatParameterTest.cpp
+    fuse/fstat/FuseFstatErrorTest.cpp
+    fuse/truncate/FuseTruncateSizeTest.cpp
+    fuse/truncate/testutils/FuseTruncateTest.cpp
+    fuse/truncate/FuseTruncateErrorTest.cpp
+    fuse/truncate/FuseTruncateFilenameTest.cpp
+    fuse/statfs/FuseStatfsReturnFilesTest.cpp
+    fuse/statfs/FuseStatfsReturnFfreeTest.cpp
+    fuse/statfs/FuseStatfsReturnNamemaxTest.cpp
+    fuse/statfs/testutils/FuseStatfsTest.cpp
+    fuse/statfs/FuseStatfsReturnBsizeTest.cpp
+    fuse/statfs/FuseStatfsErrorTest.cpp
+    fuse/statfs/FuseStatfsReturnBfreeTest.cpp
+    fuse/statfs/FuseStatfsPathParameterTest.cpp
+    fuse/statfs/FuseStatfsReturnBlocksTest.cpp
+    fuse/statfs/FuseStatfsReturnBavailTest.cpp
+    fuse/closeFile/FuseCloseTest.cpp
+    fuse/fsync/testutils/FuseFsyncTest.cpp
+    fuse/fsync/FuseFsyncFileDescriptorTest.cpp
+    fuse/fsync/FuseFsyncErrorTest.cpp
+    fuse/openFile/testutils/FuseOpenTest.cpp
+    fuse/openFile/FuseOpenFilenameTest.cpp
+    fuse/openFile/FuseOpenFlagsTest.cpp
+    fuse/openFile/FuseOpenFileDescriptorTest.cpp
+    fuse/openFile/FuseOpenErrorTest.cpp
+    fuse/access/FuseAccessFilenameTest.cpp
+    fuse/access/testutils/FuseAccessTest.cpp
+    fuse/access/FuseAccessModeTest.cpp
+    fuse/access/FuseAccessErrorTest.cpp
+    fuse/BasicFuseTest.cpp
+    fuse/rmdir/testutils/FuseRmdirTest.cpp
+    fuse/rmdir/FuseRmdirErrorTest.cpp
+    fuse/rmdir/FuseRmdirDirnameTest.cpp
+    fuse/fdatasync/testutils/FuseFdatasyncTest.cpp
+    fuse/fdatasync/FuseFdatasyncErrorTest.cpp
+    fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp
+    fuse/mkdir/testutils/FuseMkdirTest.cpp
+    fuse/mkdir/FuseMkdirErrorTest.cpp
+    fuse/mkdir/FuseMkdirModeTest.cpp
+    fuse/mkdir/FuseMkdirDirnameTest.cpp
+    fuse/write/FuseWriteErrorTest.cpp
+    fuse/write/testutils/FuseWriteTest.cpp
+    fuse/write/FuseWriteOverflowTest.cpp
+    fuse/write/FuseWriteFileDescriptorTest.cpp
+    fuse/write/FuseWriteDataTest.cpp
+    fuse/readDir/testutils/FuseReadDirTest.cpp
+    fuse/readDir/FuseReadDirDirnameTest.cpp
+    fuse/readDir/FuseReadDirErrorTest.cpp
+    fuse/readDir/FuseReadDirReturnTest.cpp
+    fuse/createAndOpenFile/FuseCreateAndOpenFilenameTest.cpp
+    fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.cpp
+    fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp
+    fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp
+    fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp
+    fuse/FilesystemTest.cpp
+    fs_interface/NodeTest.cpp
+    fs_interface/FileTest.cpp
+    fs_interface/DirTest.cpp
+    fs_interface/DeviceTest.cpp
+    fs_interface/OpenFileTest.cpp
+)
+
+add_executable(${PROJECT_NAME} ${SOURCES})
+target_link_libraries(${PROJECT_NAME} fspp)
+add_test(${PROJECT_NAME} ${PROJECT_NAME})
+
+enable_style_warnings(${PROJECT_NAME})
+activate_cpp14(${PROJECT_NAME})
diff --git a/test/fs_interface/DeviceTest.cpp b/test/fspp/fs_interface/DeviceTest.cpp
similarity index 73%
rename from test/fs_interface/DeviceTest.cpp
rename to test/fspp/fs_interface/DeviceTest.cpp
index f1fffda9..dea9204e 100644
--- a/test/fs_interface/DeviceTest.cpp
+++ b/test/fspp/fs_interface/DeviceTest.cpp
@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "../../fs_interface/Device.h"
+#include "fspp/fs_interface/Device.h"
diff --git a/test/fs_interface/DirTest.cpp b/test/fspp/fs_interface/DirTest.cpp
similarity index 75%
rename from test/fs_interface/DirTest.cpp
rename to test/fspp/fs_interface/DirTest.cpp
index 601f7d03..91a92c24 100644
--- a/test/fs_interface/DirTest.cpp
+++ b/test/fspp/fs_interface/DirTest.cpp
@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "../../fs_interface/Dir.h"
+#include "fspp/fs_interface/Dir.h"
diff --git a/test/fs_interface/FileTest.cpp b/test/fspp/fs_interface/FileTest.cpp
similarity index 74%
rename from test/fs_interface/FileTest.cpp
rename to test/fspp/fs_interface/FileTest.cpp
index a46dadae..fd4831bb 100644
--- a/test/fs_interface/FileTest.cpp
+++ b/test/fspp/fs_interface/FileTest.cpp
@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "../../fs_interface/File.h"
+#include "fspp/fs_interface/File.h"
diff --git a/test/fs_interface/NodeTest.cpp b/test/fspp/fs_interface/NodeTest.cpp
similarity index 74%
rename from test/fs_interface/NodeTest.cpp
rename to test/fspp/fs_interface/NodeTest.cpp
index c1e9f3f9..9b1a03d2 100644
--- a/test/fs_interface/NodeTest.cpp
+++ b/test/fspp/fs_interface/NodeTest.cpp
@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "../../fs_interface/Node.h"
+#include "fspp/fs_interface/Node.h"
diff --git a/test/fs_interface/OpenFileTest.cpp b/test/fspp/fs_interface/OpenFileTest.cpp
similarity index 72%
rename from test/fs_interface/OpenFileTest.cpp
rename to test/fspp/fs_interface/OpenFileTest.cpp
index 3149574a..20db933d 100644
--- a/test/fs_interface/OpenFileTest.cpp
+++ b/test/fspp/fs_interface/OpenFileTest.cpp
@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "../../fs_interface/OpenFile.h"
+#include "fspp/fs_interface/OpenFile.h"
diff --git a/test/fuse/BasicFuseTest.cpp b/test/fspp/fuse/BasicFuseTest.cpp
similarity index 100%
rename from test/fuse/BasicFuseTest.cpp
rename to test/fspp/fuse/BasicFuseTest.cpp
diff --git a/test/fuse/FilesystemTest.cpp b/test/fspp/fuse/FilesystemTest.cpp
similarity index 75%
rename from test/fuse/FilesystemTest.cpp
rename to test/fspp/fuse/FilesystemTest.cpp
index e3b8a6f4..d78cb35d 100644
--- a/test/fuse/FilesystemTest.cpp
+++ b/test/fspp/fuse/FilesystemTest.cpp
@@ -1,4 +1,4 @@
 /*
  * Tests that the header can be included without needing additional header includes as dependencies.
  */
-#include "../../fuse/Filesystem.h"
+#include "fspp/fuse/Filesystem.h"
diff --git a/test/fuse/access/FuseAccessErrorTest.cpp b/test/fspp/fuse/access/FuseAccessErrorTest.cpp
similarity index 94%
rename from test/fuse/access/FuseAccessErrorTest.cpp
rename to test/fspp/fuse/access/FuseAccessErrorTest.cpp
index c0d1734d..8c07bb69 100644
--- a/test/fuse/access/FuseAccessErrorTest.cpp
+++ b/test/fspp/fuse/access/FuseAccessErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseAccessTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/access/FuseAccessFilenameTest.cpp b/test/fspp/fuse/access/FuseAccessFilenameTest.cpp
similarity index 100%
rename from test/fuse/access/FuseAccessFilenameTest.cpp
rename to test/fspp/fuse/access/FuseAccessFilenameTest.cpp
diff --git a/test/fuse/access/FuseAccessModeTest.cpp b/test/fspp/fuse/access/FuseAccessModeTest.cpp
similarity index 100%
rename from test/fuse/access/FuseAccessModeTest.cpp
rename to test/fspp/fuse/access/FuseAccessModeTest.cpp
diff --git a/test/fuse/access/testutils/FuseAccessTest.cpp b/test/fspp/fuse/access/testutils/FuseAccessTest.cpp
similarity index 100%
rename from test/fuse/access/testutils/FuseAccessTest.cpp
rename to test/fspp/fuse/access/testutils/FuseAccessTest.cpp
diff --git a/test/fuse/access/testutils/FuseAccessTest.h b/test/fspp/fuse/access/testutils/FuseAccessTest.h
similarity index 100%
rename from test/fuse/access/testutils/FuseAccessTest.h
rename to test/fspp/fuse/access/testutils/FuseAccessTest.h
diff --git a/test/fuse/closeFile/FuseCloseTest.cpp b/test/fspp/fuse/closeFile/FuseCloseTest.cpp
similarity index 100%
rename from test/fuse/closeFile/FuseCloseTest.cpp
rename to test/fspp/fuse/closeFile/FuseCloseTest.cpp
diff --git a/test/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp
similarity index 96%
rename from test/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp
rename to test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp
index 1711ad6c..d3cda188 100644
--- a/test/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp
+++ b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseCreateAndOpenTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;
diff --git a/test/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp
similarity index 100%
rename from test/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp
rename to test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFileDescriptorTest.cpp
diff --git a/test/fuse/createAndOpenFile/FuseCreateAndOpenFilenameTest.cpp b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFilenameTest.cpp
similarity index 100%
rename from test/fuse/createAndOpenFile/FuseCreateAndOpenFilenameTest.cpp
rename to test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFilenameTest.cpp
diff --git a/test/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp b/test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp
similarity index 100%
rename from test/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp
rename to test/fspp/fuse/createAndOpenFile/FuseCreateAndOpenFlagsTest.cpp
diff --git a/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.cpp b/test/fspp/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.cpp
similarity index 100%
rename from test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.cpp
rename to test/fspp/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.cpp
diff --git a/test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h b/test/fspp/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
similarity index 100%
rename from test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
rename to test/fspp/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h
diff --git a/test/fuse/fdatasync/FuseFdatasyncErrorTest.cpp b/test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp
similarity index 94%
rename from test/fuse/fdatasync/FuseFdatasyncErrorTest.cpp
rename to test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp
index c77b83ff..4136345b 100644
--- a/test/fuse/fdatasync/FuseFdatasyncErrorTest.cpp
+++ b/test/fspp/fuse/fdatasync/FuseFdatasyncErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFdatasyncTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp b/test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp
similarity index 93%
rename from test/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp
rename to test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp
index 1f563418..fb5c99c8 100644
--- a/test/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp
+++ b/test/fspp/fuse/fdatasync/FuseFdatasyncFileDescriptorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFdatasyncTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/fdatasync/testutils/FuseFdatasyncTest.cpp b/test/fspp/fuse/fdatasync/testutils/FuseFdatasyncTest.cpp
similarity index 100%
rename from test/fuse/fdatasync/testutils/FuseFdatasyncTest.cpp
rename to test/fspp/fuse/fdatasync/testutils/FuseFdatasyncTest.cpp
diff --git a/test/fuse/fdatasync/testutils/FuseFdatasyncTest.h b/test/fspp/fuse/fdatasync/testutils/FuseFdatasyncTest.h
similarity index 100%
rename from test/fuse/fdatasync/testutils/FuseFdatasyncTest.h
rename to test/fspp/fuse/fdatasync/testutils/FuseFdatasyncTest.h
diff --git a/test/fuse/flush/FuseFlushErrorTest.cpp b/test/fspp/fuse/flush/FuseFlushErrorTest.cpp
similarity index 95%
rename from test/fuse/flush/FuseFlushErrorTest.cpp
rename to test/fspp/fuse/flush/FuseFlushErrorTest.cpp
index 8a79c391..54be24c6 100644
--- a/test/fuse/flush/FuseFlushErrorTest.cpp
+++ b/test/fspp/fuse/flush/FuseFlushErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFlushTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::StrEq;
diff --git a/test/fuse/flush/FuseFlushFileDescriptorTest.cpp b/test/fspp/fuse/flush/FuseFlushFileDescriptorTest.cpp
similarity index 100%
rename from test/fuse/flush/FuseFlushFileDescriptorTest.cpp
rename to test/fspp/fuse/flush/FuseFlushFileDescriptorTest.cpp
diff --git a/test/fuse/flush/testutils/FuseFlushTest.cpp b/test/fspp/fuse/flush/testutils/FuseFlushTest.cpp
similarity index 100%
rename from test/fuse/flush/testutils/FuseFlushTest.cpp
rename to test/fspp/fuse/flush/testutils/FuseFlushTest.cpp
diff --git a/test/fuse/flush/testutils/FuseFlushTest.h b/test/fspp/fuse/flush/testutils/FuseFlushTest.h
similarity index 100%
rename from test/fuse/flush/testutils/FuseFlushTest.h
rename to test/fspp/fuse/flush/testutils/FuseFlushTest.h
diff --git a/test/fuse/fstat/FuseFstatErrorTest.cpp b/test/fspp/fuse/fstat/FuseFstatErrorTest.cpp
similarity index 96%
rename from test/fuse/fstat/FuseFstatErrorTest.cpp
rename to test/fspp/fuse/fstat/FuseFstatErrorTest.cpp
index da19139e..f9765832 100644
--- a/test/fuse/fstat/FuseFstatErrorTest.cpp
+++ b/test/fspp/fuse/fstat/FuseFstatErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFstatTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/fstat/FuseFstatParameterTest.cpp b/test/fspp/fuse/fstat/FuseFstatParameterTest.cpp
similarity index 95%
rename from test/fuse/fstat/FuseFstatParameterTest.cpp
rename to test/fspp/fuse/fstat/FuseFstatParameterTest.cpp
index 259eca95..e0fd043f 100644
--- a/test/fuse/fstat/FuseFstatParameterTest.cpp
+++ b/test/fspp/fuse/fstat/FuseFstatParameterTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFstatTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/fstat/README b/test/fspp/fuse/fstat/README
similarity index 100%
rename from test/fuse/fstat/README
rename to test/fspp/fuse/fstat/README
diff --git a/test/fuse/fstat/testutils/FuseFstatTest.cpp b/test/fspp/fuse/fstat/testutils/FuseFstatTest.cpp
similarity index 100%
rename from test/fuse/fstat/testutils/FuseFstatTest.cpp
rename to test/fspp/fuse/fstat/testutils/FuseFstatTest.cpp
diff --git a/test/fuse/fstat/testutils/FuseFstatTest.h b/test/fspp/fuse/fstat/testutils/FuseFstatTest.h
similarity index 100%
rename from test/fuse/fstat/testutils/FuseFstatTest.h
rename to test/fspp/fuse/fstat/testutils/FuseFstatTest.h
diff --git a/test/fuse/fsync/FuseFsyncErrorTest.cpp b/test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp
similarity index 93%
rename from test/fuse/fsync/FuseFsyncErrorTest.cpp
rename to test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp
index b298d72e..81a7dbec 100644
--- a/test/fuse/fsync/FuseFsyncErrorTest.cpp
+++ b/test/fspp/fuse/fsync/FuseFsyncErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFsyncTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/fsync/FuseFsyncFileDescriptorTest.cpp b/test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp
similarity index 93%
rename from test/fuse/fsync/FuseFsyncFileDescriptorTest.cpp
rename to test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp
index 1c4b1c3a..d6413305 100644
--- a/test/fuse/fsync/FuseFsyncFileDescriptorTest.cpp
+++ b/test/fspp/fuse/fsync/FuseFsyncFileDescriptorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFsyncTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/fsync/testutils/FuseFsyncTest.cpp b/test/fspp/fuse/fsync/testutils/FuseFsyncTest.cpp
similarity index 100%
rename from test/fuse/fsync/testutils/FuseFsyncTest.cpp
rename to test/fspp/fuse/fsync/testutils/FuseFsyncTest.cpp
diff --git a/test/fuse/fsync/testutils/FuseFsyncTest.h b/test/fspp/fuse/fsync/testutils/FuseFsyncTest.h
similarity index 100%
rename from test/fuse/fsync/testutils/FuseFsyncTest.h
rename to test/fspp/fuse/fsync/testutils/FuseFsyncTest.h
diff --git a/test/fuse/ftruncate/FuseFTruncateErrorTest.cpp b/test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp
similarity index 95%
rename from test/fuse/ftruncate/FuseFTruncateErrorTest.cpp
rename to test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp
index 30aa8ae0..4aeca3e8 100644
--- a/test/fuse/ftruncate/FuseFTruncateErrorTest.cpp
+++ b/test/fspp/fuse/ftruncate/FuseFTruncateErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFTruncateTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp b/test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp
similarity index 94%
rename from test/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp
rename to test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp
index 2e234289..2374bc81 100644
--- a/test/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp
+++ b/test/fspp/fuse/ftruncate/FuseFTruncateFileDescriptorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseFTruncateTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/ftruncate/FuseFTruncateSizeTest.cpp b/test/fspp/fuse/ftruncate/FuseFTruncateSizeTest.cpp
similarity index 100%
rename from test/fuse/ftruncate/FuseFTruncateSizeTest.cpp
rename to test/fspp/fuse/ftruncate/FuseFTruncateSizeTest.cpp
diff --git a/test/fuse/ftruncate/testutils/FuseFTruncateTest.cpp b/test/fspp/fuse/ftruncate/testutils/FuseFTruncateTest.cpp
similarity index 100%
rename from test/fuse/ftruncate/testutils/FuseFTruncateTest.cpp
rename to test/fspp/fuse/ftruncate/testutils/FuseFTruncateTest.cpp
diff --git a/test/fuse/ftruncate/testutils/FuseFTruncateTest.h b/test/fspp/fuse/ftruncate/testutils/FuseFTruncateTest.h
similarity index 100%
rename from test/fuse/ftruncate/testutils/FuseFTruncateTest.h
rename to test/fspp/fuse/ftruncate/testutils/FuseFTruncateTest.h
diff --git a/test/fuse/lstat/FuseLstatErrorTest.cpp b/test/fspp/fuse/lstat/FuseLstatErrorTest.cpp
similarity index 95%
rename from test/fuse/lstat/FuseLstatErrorTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatErrorTest.cpp
index 660bbb76..d3cdca96 100644
--- a/test/fuse/lstat/FuseLstatErrorTest.cpp
+++ b/test/fspp/fuse/lstat/FuseLstatErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseLstatTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::_;
diff --git a/test/fuse/lstat/FuseLstatPathParameterTest.cpp b/test/fspp/fuse/lstat/FuseLstatPathParameterTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatPathParameterTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatPathParameterTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnAtimeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnAtimeTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnAtimeTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnAtimeTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnCtimeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnCtimeTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnCtimeTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnCtimeTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnGidTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnGidTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnGidTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnGidTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnModeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnModeTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnModeTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnModeTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnMtimeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnMtimeTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnMtimeTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnMtimeTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnNlinkTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnNlinkTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnNlinkTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnNlinkTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnSizeTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnSizeTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnSizeTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnSizeTest.cpp
diff --git a/test/fuse/lstat/FuseLstatReturnUidTest.cpp b/test/fspp/fuse/lstat/FuseLstatReturnUidTest.cpp
similarity index 100%
rename from test/fuse/lstat/FuseLstatReturnUidTest.cpp
rename to test/fspp/fuse/lstat/FuseLstatReturnUidTest.cpp
diff --git a/test/fuse/lstat/testutils/FuseLstatReturnTest.h b/test/fspp/fuse/lstat/testutils/FuseLstatReturnTest.h
similarity index 100%
rename from test/fuse/lstat/testutils/FuseLstatReturnTest.h
rename to test/fspp/fuse/lstat/testutils/FuseLstatReturnTest.h
diff --git a/test/fuse/lstat/testutils/FuseLstatTest.cpp b/test/fspp/fuse/lstat/testutils/FuseLstatTest.cpp
similarity index 100%
rename from test/fuse/lstat/testutils/FuseLstatTest.cpp
rename to test/fspp/fuse/lstat/testutils/FuseLstatTest.cpp
diff --git a/test/fuse/lstat/testutils/FuseLstatTest.h b/test/fspp/fuse/lstat/testutils/FuseLstatTest.h
similarity index 100%
rename from test/fuse/lstat/testutils/FuseLstatTest.h
rename to test/fspp/fuse/lstat/testutils/FuseLstatTest.h
diff --git a/test/fuse/mkdir/FuseMkdirDirnameTest.cpp b/test/fspp/fuse/mkdir/FuseMkdirDirnameTest.cpp
similarity index 100%
rename from test/fuse/mkdir/FuseMkdirDirnameTest.cpp
rename to test/fspp/fuse/mkdir/FuseMkdirDirnameTest.cpp
diff --git a/test/fuse/mkdir/FuseMkdirErrorTest.cpp b/test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp
similarity index 95%
rename from test/fuse/mkdir/FuseMkdirErrorTest.cpp
rename to test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp
index cc9af14e..a52f211f 100644
--- a/test/fuse/mkdir/FuseMkdirErrorTest.cpp
+++ b/test/fspp/fuse/mkdir/FuseMkdirErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseMkdirTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/mkdir/FuseMkdirModeTest.cpp b/test/fspp/fuse/mkdir/FuseMkdirModeTest.cpp
similarity index 100%
rename from test/fuse/mkdir/FuseMkdirModeTest.cpp
rename to test/fspp/fuse/mkdir/FuseMkdirModeTest.cpp
diff --git a/test/fuse/mkdir/testutils/FuseMkdirTest.cpp b/test/fspp/fuse/mkdir/testutils/FuseMkdirTest.cpp
similarity index 100%
rename from test/fuse/mkdir/testutils/FuseMkdirTest.cpp
rename to test/fspp/fuse/mkdir/testutils/FuseMkdirTest.cpp
diff --git a/test/fuse/mkdir/testutils/FuseMkdirTest.h b/test/fspp/fuse/mkdir/testutils/FuseMkdirTest.h
similarity index 100%
rename from test/fuse/mkdir/testutils/FuseMkdirTest.h
rename to test/fspp/fuse/mkdir/testutils/FuseMkdirTest.h
diff --git a/test/fuse/openFile/FuseOpenErrorTest.cpp b/test/fspp/fuse/openFile/FuseOpenErrorTest.cpp
similarity index 96%
rename from test/fuse/openFile/FuseOpenErrorTest.cpp
rename to test/fspp/fuse/openFile/FuseOpenErrorTest.cpp
index ebb63505..4ab7653a 100644
--- a/test/fuse/openFile/FuseOpenErrorTest.cpp
+++ b/test/fspp/fuse/openFile/FuseOpenErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseOpenTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::WithParamInterface;
 using ::testing::Values;
diff --git a/test/fuse/openFile/FuseOpenFileDescriptorTest.cpp b/test/fspp/fuse/openFile/FuseOpenFileDescriptorTest.cpp
similarity index 100%
rename from test/fuse/openFile/FuseOpenFileDescriptorTest.cpp
rename to test/fspp/fuse/openFile/FuseOpenFileDescriptorTest.cpp
diff --git a/test/fuse/openFile/FuseOpenFilenameTest.cpp b/test/fspp/fuse/openFile/FuseOpenFilenameTest.cpp
similarity index 100%
rename from test/fuse/openFile/FuseOpenFilenameTest.cpp
rename to test/fspp/fuse/openFile/FuseOpenFilenameTest.cpp
diff --git a/test/fuse/openFile/FuseOpenFlagsTest.cpp b/test/fspp/fuse/openFile/FuseOpenFlagsTest.cpp
similarity index 100%
rename from test/fuse/openFile/FuseOpenFlagsTest.cpp
rename to test/fspp/fuse/openFile/FuseOpenFlagsTest.cpp
diff --git a/test/fuse/openFile/testutils/FuseOpenTest.cpp b/test/fspp/fuse/openFile/testutils/FuseOpenTest.cpp
similarity index 100%
rename from test/fuse/openFile/testutils/FuseOpenTest.cpp
rename to test/fspp/fuse/openFile/testutils/FuseOpenTest.cpp
diff --git a/test/fuse/openFile/testutils/FuseOpenTest.h b/test/fspp/fuse/openFile/testutils/FuseOpenTest.h
similarity index 100%
rename from test/fuse/openFile/testutils/FuseOpenTest.h
rename to test/fspp/fuse/openFile/testutils/FuseOpenTest.h
diff --git a/test/fuse/read/FuseReadErrorTest.cpp b/test/fspp/fuse/read/FuseReadErrorTest.cpp
similarity index 97%
rename from test/fuse/read/FuseReadErrorTest.cpp
rename to test/fspp/fuse/read/FuseReadErrorTest.cpp
index 10db3486..ab50fb76 100644
--- a/test/fuse/read/FuseReadErrorTest.cpp
+++ b/test/fspp/fuse/read/FuseReadErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/read/FuseReadFileDescriptorTest.cpp b/test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp
similarity index 94%
rename from test/fuse/read/FuseReadFileDescriptorTest.cpp
rename to test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp
index f3aedc91..3170af4c 100644
--- a/test/fuse/read/FuseReadFileDescriptorTest.cpp
+++ b/test/fspp/fuse/read/FuseReadFileDescriptorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/read/FuseReadOverflowTest.cpp b/test/fspp/fuse/read/FuseReadOverflowTest.cpp
similarity index 95%
rename from test/fuse/read/FuseReadOverflowTest.cpp
rename to test/fspp/fuse/read/FuseReadOverflowTest.cpp
index 953fd1a9..78175d65 100644
--- a/test/fuse/read/FuseReadOverflowTest.cpp
+++ b/test/fspp/fuse/read/FuseReadOverflowTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseReadTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/read/FuseReadReturnedDataTest.cpp b/test/fspp/fuse/read/FuseReadReturnedDataTest.cpp
similarity index 93%
rename from test/fuse/read/FuseReadReturnedDataTest.cpp
rename to test/fspp/fuse/read/FuseReadReturnedDataTest.cpp
index 73596cc2..0c0e503b 100644
--- a/test/fuse/read/FuseReadReturnedDataTest.cpp
+++ b/test/fspp/fuse/read/FuseReadReturnedDataTest.cpp
@@ -1,10 +1,10 @@
-#include <messmer/cpp-utils/data/DataFixture.h>
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/DataFixture.h>
+#include <cpp-utils/data/Data.h>
 #include "../../testutils/InMemoryFile.h"
 #include "testutils/FuseReadTest.h"
-#include <messmer/cpp-utils/pointer/unique_ref.h>
+#include <cpp-utils/pointer/unique_ref.h>
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 #include <tuple>
 #include <cstdlib>
diff --git a/test/fuse/read/testutils/FuseReadTest.cpp b/test/fspp/fuse/read/testutils/FuseReadTest.cpp
similarity index 100%
rename from test/fuse/read/testutils/FuseReadTest.cpp
rename to test/fspp/fuse/read/testutils/FuseReadTest.cpp
diff --git a/test/fuse/read/testutils/FuseReadTest.h b/test/fspp/fuse/read/testutils/FuseReadTest.h
similarity index 100%
rename from test/fuse/read/testutils/FuseReadTest.h
rename to test/fspp/fuse/read/testutils/FuseReadTest.h
diff --git a/test/fuse/readDir/FuseReadDirDirnameTest.cpp b/test/fspp/fuse/readDir/FuseReadDirDirnameTest.cpp
similarity index 100%
rename from test/fuse/readDir/FuseReadDirDirnameTest.cpp
rename to test/fspp/fuse/readDir/FuseReadDirDirnameTest.cpp
diff --git a/test/fuse/readDir/FuseReadDirErrorTest.cpp b/test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp
similarity index 95%
rename from test/fuse/readDir/FuseReadDirErrorTest.cpp
rename to test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp
index 70082f52..6fe313c4 100644
--- a/test/fuse/readDir/FuseReadDirErrorTest.cpp
+++ b/test/fspp/fuse/readDir/FuseReadDirErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseReadDirTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/readDir/FuseReadDirReturnTest.cpp b/test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp
similarity index 95%
rename from test/fuse/readDir/FuseReadDirReturnTest.cpp
rename to test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp
index 3c43b6cd..3723ba36 100644
--- a/test/fuse/readDir/FuseReadDirReturnTest.cpp
+++ b/test/fspp/fuse/readDir/FuseReadDirReturnTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseReadDirTest.h"
-#include <messmer/cpp-utils/pointer/unique_ref.h>
-#include "../../../fuse/FuseErrnoException.h"
+#include <cpp-utils/pointer/unique_ref.h>
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/readDir/testutils/FuseReadDirTest.cpp b/test/fspp/fuse/readDir/testutils/FuseReadDirTest.cpp
similarity index 100%
rename from test/fuse/readDir/testutils/FuseReadDirTest.cpp
rename to test/fspp/fuse/readDir/testutils/FuseReadDirTest.cpp
diff --git a/test/fuse/readDir/testutils/FuseReadDirTest.h b/test/fspp/fuse/readDir/testutils/FuseReadDirTest.h
similarity index 95%
rename from test/fuse/readDir/testutils/FuseReadDirTest.h
rename to test/fspp/fuse/readDir/testutils/FuseReadDirTest.h
index 66492139..19787aca 100644
--- a/test/fuse/readDir/testutils/FuseReadDirTest.h
+++ b/test/fspp/fuse/readDir/testutils/FuseReadDirTest.h
@@ -4,7 +4,7 @@
 
 #include "../../../testutils/FuseTest.h"
 #include <dirent.h>
-#include "../../../../fs_interface/Dir.h"
+#include "fspp/fs_interface/Dir.h"
 
 class FuseReadDirTest: public FuseTest {
 public:
diff --git a/test/fuse/rename/FuseRenameErrorTest.cpp b/test/fspp/fuse/rename/FuseRenameErrorTest.cpp
similarity index 94%
rename from test/fuse/rename/FuseRenameErrorTest.cpp
rename to test/fspp/fuse/rename/FuseRenameErrorTest.cpp
index 1c0597ba..15079d53 100644
--- a/test/fuse/rename/FuseRenameErrorTest.cpp
+++ b/test/fspp/fuse/rename/FuseRenameErrorTest.cpp
@@ -1,5 +1,5 @@
 #include "testutils/FuseRenameTest.h"
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/rename/FuseRenameFilenameTest.cpp b/test/fspp/fuse/rename/FuseRenameFilenameTest.cpp
similarity index 100%
rename from test/fuse/rename/FuseRenameFilenameTest.cpp
rename to test/fspp/fuse/rename/FuseRenameFilenameTest.cpp
diff --git a/test/fuse/rename/testutils/FuseRenameTest.cpp b/test/fspp/fuse/rename/testutils/FuseRenameTest.cpp
similarity index 100%
rename from test/fuse/rename/testutils/FuseRenameTest.cpp
rename to test/fspp/fuse/rename/testutils/FuseRenameTest.cpp
diff --git a/test/fuse/rename/testutils/FuseRenameTest.h b/test/fspp/fuse/rename/testutils/FuseRenameTest.h
similarity index 100%
rename from test/fuse/rename/testutils/FuseRenameTest.h
rename to test/fspp/fuse/rename/testutils/FuseRenameTest.h
diff --git a/test/fuse/rmdir/FuseRmdirDirnameTest.cpp b/test/fspp/fuse/rmdir/FuseRmdirDirnameTest.cpp
similarity index 100%
rename from test/fuse/rmdir/FuseRmdirDirnameTest.cpp
rename to test/fspp/fuse/rmdir/FuseRmdirDirnameTest.cpp
diff --git a/test/fuse/rmdir/FuseRmdirErrorTest.cpp b/test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp
similarity index 94%
rename from test/fuse/rmdir/FuseRmdirErrorTest.cpp
rename to test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp
index a017218d..37d281c1 100644
--- a/test/fuse/rmdir/FuseRmdirErrorTest.cpp
+++ b/test/fspp/fuse/rmdir/FuseRmdirErrorTest.cpp
@@ -1,5 +1,5 @@
 #include "testutils/FuseRmdirTest.h"
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/rmdir/testutils/FuseRmdirTest.cpp b/test/fspp/fuse/rmdir/testutils/FuseRmdirTest.cpp
similarity index 100%
rename from test/fuse/rmdir/testutils/FuseRmdirTest.cpp
rename to test/fspp/fuse/rmdir/testutils/FuseRmdirTest.cpp
diff --git a/test/fuse/rmdir/testutils/FuseRmdirTest.h b/test/fspp/fuse/rmdir/testutils/FuseRmdirTest.h
similarity index 100%
rename from test/fuse/rmdir/testutils/FuseRmdirTest.h
rename to test/fspp/fuse/rmdir/testutils/FuseRmdirTest.h
diff --git a/test/fuse/statfs/FuseStatfsErrorTest.cpp b/test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp
similarity index 95%
rename from test/fuse/statfs/FuseStatfsErrorTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp
index c86d195f..44d24f4a 100644
--- a/test/fuse/statfs/FuseStatfsErrorTest.cpp
+++ b/test/fspp/fuse/statfs/FuseStatfsErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseStatfsTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::StrEq;
 using ::testing::_;
diff --git a/test/fuse/statfs/FuseStatfsPathParameterTest.cpp b/test/fspp/fuse/statfs/FuseStatfsPathParameterTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsPathParameterTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsPathParameterTest.cpp
diff --git a/test/fuse/statfs/FuseStatfsReturnBavailTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBavailTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsReturnBavailTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsReturnBavailTest.cpp
diff --git a/test/fuse/statfs/FuseStatfsReturnBfreeTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBfreeTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsReturnBfreeTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsReturnBfreeTest.cpp
diff --git a/test/fuse/statfs/FuseStatfsReturnBlocksTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBlocksTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsReturnBlocksTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsReturnBlocksTest.cpp
diff --git a/test/fuse/statfs/FuseStatfsReturnBsizeTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnBsizeTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsReturnBsizeTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsReturnBsizeTest.cpp
diff --git a/test/fuse/statfs/FuseStatfsReturnFfreeTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnFfreeTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsReturnFfreeTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsReturnFfreeTest.cpp
diff --git a/test/fuse/statfs/FuseStatfsReturnFilesTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnFilesTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsReturnFilesTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsReturnFilesTest.cpp
diff --git a/test/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp b/test/fspp/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp
similarity index 100%
rename from test/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp
rename to test/fspp/fuse/statfs/FuseStatfsReturnNamemaxTest.cpp
diff --git a/test/fuse/statfs/testutils/FuseStatfsReturnTest.h b/test/fspp/fuse/statfs/testutils/FuseStatfsReturnTest.h
similarity index 100%
rename from test/fuse/statfs/testutils/FuseStatfsReturnTest.h
rename to test/fspp/fuse/statfs/testutils/FuseStatfsReturnTest.h
diff --git a/test/fuse/statfs/testutils/FuseStatfsTest.cpp b/test/fspp/fuse/statfs/testutils/FuseStatfsTest.cpp
similarity index 100%
rename from test/fuse/statfs/testutils/FuseStatfsTest.cpp
rename to test/fspp/fuse/statfs/testutils/FuseStatfsTest.cpp
diff --git a/test/fuse/statfs/testutils/FuseStatfsTest.h b/test/fspp/fuse/statfs/testutils/FuseStatfsTest.h
similarity index 100%
rename from test/fuse/statfs/testutils/FuseStatfsTest.h
rename to test/fspp/fuse/statfs/testutils/FuseStatfsTest.h
diff --git a/test/fuse/truncate/FuseTruncateErrorTest.cpp b/test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp
similarity index 94%
rename from test/fuse/truncate/FuseTruncateErrorTest.cpp
rename to test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp
index 3bc5679a..582cc9df 100644
--- a/test/fuse/truncate/FuseTruncateErrorTest.cpp
+++ b/test/fspp/fuse/truncate/FuseTruncateErrorTest.cpp
@@ -1,5 +1,5 @@
 #include "testutils/FuseTruncateTest.h"
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/truncate/FuseTruncateFilenameTest.cpp b/test/fspp/fuse/truncate/FuseTruncateFilenameTest.cpp
similarity index 100%
rename from test/fuse/truncate/FuseTruncateFilenameTest.cpp
rename to test/fspp/fuse/truncate/FuseTruncateFilenameTest.cpp
diff --git a/test/fuse/truncate/FuseTruncateSizeTest.cpp b/test/fspp/fuse/truncate/FuseTruncateSizeTest.cpp
similarity index 100%
rename from test/fuse/truncate/FuseTruncateSizeTest.cpp
rename to test/fspp/fuse/truncate/FuseTruncateSizeTest.cpp
diff --git a/test/fuse/truncate/testutils/FuseTruncateTest.cpp b/test/fspp/fuse/truncate/testutils/FuseTruncateTest.cpp
similarity index 100%
rename from test/fuse/truncate/testutils/FuseTruncateTest.cpp
rename to test/fspp/fuse/truncate/testutils/FuseTruncateTest.cpp
diff --git a/test/fuse/truncate/testutils/FuseTruncateTest.h b/test/fspp/fuse/truncate/testutils/FuseTruncateTest.h
similarity index 100%
rename from test/fuse/truncate/testutils/FuseTruncateTest.h
rename to test/fspp/fuse/truncate/testutils/FuseTruncateTest.h
diff --git a/test/fuse/unlink/FuseUnlinkErrorTest.cpp b/test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp
similarity index 94%
rename from test/fuse/unlink/FuseUnlinkErrorTest.cpp
rename to test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp
index 3b3344de..dc568e73 100644
--- a/test/fuse/unlink/FuseUnlinkErrorTest.cpp
+++ b/test/fspp/fuse/unlink/FuseUnlinkErrorTest.cpp
@@ -1,5 +1,5 @@
 #include "testutils/FuseUnlinkTest.h"
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/unlink/FuseUnlinkFilenameTest.cpp b/test/fspp/fuse/unlink/FuseUnlinkFilenameTest.cpp
similarity index 100%
rename from test/fuse/unlink/FuseUnlinkFilenameTest.cpp
rename to test/fspp/fuse/unlink/FuseUnlinkFilenameTest.cpp
diff --git a/test/fuse/unlink/testutils/FuseUnlinkTest.cpp b/test/fspp/fuse/unlink/testutils/FuseUnlinkTest.cpp
similarity index 100%
rename from test/fuse/unlink/testutils/FuseUnlinkTest.cpp
rename to test/fspp/fuse/unlink/testutils/FuseUnlinkTest.cpp
diff --git a/test/fuse/unlink/testutils/FuseUnlinkTest.h b/test/fspp/fuse/unlink/testutils/FuseUnlinkTest.h
similarity index 100%
rename from test/fuse/unlink/testutils/FuseUnlinkTest.h
rename to test/fspp/fuse/unlink/testutils/FuseUnlinkTest.h
diff --git a/test/fuse/utimens/FuseUtimensErrorTest.cpp b/test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp
similarity index 93%
rename from test/fuse/utimens/FuseUtimensErrorTest.cpp
rename to test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp
index ffc5a24d..1389ede4 100644
--- a/test/fuse/utimens/FuseUtimensErrorTest.cpp
+++ b/test/fspp/fuse/utimens/FuseUtimensErrorTest.cpp
@@ -1,5 +1,5 @@
 #include "testutils/FuseUtimensTest.h"
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/utimens/FuseUtimensFilenameTest.cpp b/test/fspp/fuse/utimens/FuseUtimensFilenameTest.cpp
similarity index 100%
rename from test/fuse/utimens/FuseUtimensFilenameTest.cpp
rename to test/fspp/fuse/utimens/FuseUtimensFilenameTest.cpp
diff --git a/test/fuse/utimens/FuseUtimensTimeParameterTest.cpp b/test/fspp/fuse/utimens/FuseUtimensTimeParameterTest.cpp
similarity index 100%
rename from test/fuse/utimens/FuseUtimensTimeParameterTest.cpp
rename to test/fspp/fuse/utimens/FuseUtimensTimeParameterTest.cpp
diff --git a/test/fuse/utimens/testutils/FuseUtimensTest.cpp b/test/fspp/fuse/utimens/testutils/FuseUtimensTest.cpp
similarity index 100%
rename from test/fuse/utimens/testutils/FuseUtimensTest.cpp
rename to test/fspp/fuse/utimens/testutils/FuseUtimensTest.cpp
diff --git a/test/fuse/utimens/testutils/FuseUtimensTest.h b/test/fspp/fuse/utimens/testutils/FuseUtimensTest.h
similarity index 100%
rename from test/fuse/utimens/testutils/FuseUtimensTest.h
rename to test/fspp/fuse/utimens/testutils/FuseUtimensTest.h
diff --git a/test/fuse/write/FuseWriteDataTest.cpp b/test/fspp/fuse/write/FuseWriteDataTest.cpp
similarity index 96%
rename from test/fuse/write/FuseWriteDataTest.cpp
rename to test/fspp/fuse/write/FuseWriteDataTest.cpp
index 8a6bd780..270effb5 100644
--- a/test/fuse/write/FuseWriteDataTest.cpp
+++ b/test/fspp/fuse/write/FuseWriteDataTest.cpp
@@ -1,8 +1,8 @@
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <cpp-utils/data/DataFixture.h>
 #include "testutils/FuseWriteTest.h"
 #include "../../testutils/InMemoryFile.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 #include <tuple>
 #include <cstdlib>
diff --git a/test/fuse/write/FuseWriteErrorTest.cpp b/test/fspp/fuse/write/FuseWriteErrorTest.cpp
similarity index 97%
rename from test/fuse/write/FuseWriteErrorTest.cpp
rename to test/fspp/fuse/write/FuseWriteErrorTest.cpp
index 134dde44..a3031aa9 100644
--- a/test/fuse/write/FuseWriteErrorTest.cpp
+++ b/test/fspp/fuse/write/FuseWriteErrorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseWriteTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/write/FuseWriteFileDescriptorTest.cpp b/test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp
similarity index 94%
rename from test/fuse/write/FuseWriteFileDescriptorTest.cpp
rename to test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp
index 7464eb4f..6a18087a 100644
--- a/test/fuse/write/FuseWriteFileDescriptorTest.cpp
+++ b/test/fspp/fuse/write/FuseWriteFileDescriptorTest.cpp
@@ -1,6 +1,6 @@
 #include "testutils/FuseWriteTest.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/write/FuseWriteOverflowTest.cpp b/test/fspp/fuse/write/FuseWriteOverflowTest.cpp
similarity index 96%
rename from test/fuse/write/FuseWriteOverflowTest.cpp
rename to test/fspp/fuse/write/FuseWriteOverflowTest.cpp
index 1076de57..5c4ed422 100644
--- a/test/fuse/write/FuseWriteOverflowTest.cpp
+++ b/test/fspp/fuse/write/FuseWriteOverflowTest.cpp
@@ -1,8 +1,8 @@
-#include <messmer/cpp-utils/data/DataFixture.h>
+#include <cpp-utils/data/DataFixture.h>
 #include "testutils/FuseWriteTest.h"
 #include "../../testutils/InMemoryFile.h"
 
-#include "../../../fuse/FuseErrnoException.h"
+#include "fspp/fuse/FuseErrnoException.h"
 
 using ::testing::_;
 using ::testing::StrEq;
diff --git a/test/fuse/write/testutils/FuseWriteTest.cpp b/test/fspp/fuse/write/testutils/FuseWriteTest.cpp
similarity index 100%
rename from test/fuse/write/testutils/FuseWriteTest.cpp
rename to test/fspp/fuse/write/testutils/FuseWriteTest.cpp
diff --git a/test/fuse/write/testutils/FuseWriteTest.h b/test/fspp/fuse/write/testutils/FuseWriteTest.h
similarity index 100%
rename from test/fuse/write/testutils/FuseWriteTest.h
rename to test/fspp/fuse/write/testutils/FuseWriteTest.h
diff --git a/test/impl/FuseOpenFileListTest.cpp b/test/fspp/impl/FuseOpenFileListTest.cpp
similarity index 96%
rename from test/impl/FuseOpenFileListTest.cpp
rename to test/fspp/impl/FuseOpenFileListTest.cpp
index d6c7401c..be104fd8 100644
--- a/test/impl/FuseOpenFileListTest.cpp
+++ b/test/fspp/impl/FuseOpenFileListTest.cpp
@@ -1,7 +1,7 @@
-#include "google/gtest/gtest.h"
-#include "google/gmock/gmock.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
-#include "../../impl/FuseOpenFileList.h"
+#include "fspp/impl/FuseOpenFileList.h"
 
 #include <stdexcept>
 
diff --git a/test/impl/IdListTest.cpp b/test/fspp/impl/IdListTest.cpp
similarity index 97%
rename from test/impl/IdListTest.cpp
rename to test/fspp/impl/IdListTest.cpp
index a046904a..dc6b289d 100644
--- a/test/impl/IdListTest.cpp
+++ b/test/fspp/impl/IdListTest.cpp
@@ -1,6 +1,6 @@
-#include "google/gtest/gtest.h"
+#include <gtest/gtest.h>
 
-#include "../../impl/IdList.h"
+#include "fspp/impl/IdList.h"
 #include <stdexcept>
 
 using cpputils::make_unique_ref;
diff --git a/test/testutils/FuseTest.cpp b/test/fspp/testutils/FuseTest.cpp
similarity index 100%
rename from test/testutils/FuseTest.cpp
rename to test/fspp/testutils/FuseTest.cpp
diff --git a/test/testutils/FuseTest.h b/test/fspp/testutils/FuseTest.h
similarity index 95%
rename from test/testutils/FuseTest.h
rename to test/fspp/testutils/FuseTest.h
index 04136581..1cf3d345 100644
--- a/test/testutils/FuseTest.h
+++ b/test/fspp/testutils/FuseTest.h
@@ -2,17 +2,17 @@
 #ifndef MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_
 #define MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_
 
-#include "google/gtest/gtest.h"
-#include "google/gmock/gmock.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
 
-#include "../../fuse/Filesystem.h"
-#include "../../fuse/FuseErrnoException.h"
-#include "../../fuse/Fuse.h"
-#include "../../fs_interface/Dir.h"
+#include "fspp/fuse/Filesystem.h"
+#include "fspp/fuse/FuseErrnoException.h"
+#include "fspp/fuse/Fuse.h"
+#include "fspp/fs_interface/Dir.h"
 
 #include <boost/filesystem.hpp>
 
-#include <messmer/cpp-utils/tempfile/TempDir.h>
+#include <cpp-utils/tempfile/TempDir.h>
 #include "FuseThread.h"
 
 #define MOCK_PATH_METHOD1(NAME, RETURNTYPE)                        \
diff --git a/test/testutils/FuseThread.cpp b/test/fspp/testutils/FuseThread.cpp
similarity index 91%
rename from test/testutils/FuseThread.cpp
rename to test/fspp/testutils/FuseThread.cpp
index b684884b..4c6e95f2 100644
--- a/test/testutils/FuseThread.cpp
+++ b/test/fspp/testutils/FuseThread.cpp
@@ -3,8 +3,8 @@
 #include <sys/wait.h>
 #include "FuseThread.h"
 #include <csignal>
-#include <messmer/cpp-utils/assert/assert.h>
-#include "../../fuse/Fuse.h"
+#include <cpp-utils/assert/assert.h>
+#include "fspp/fuse/Fuse.h"
 
 using boost::thread;
 using boost::chrono::seconds;
diff --git a/test/testutils/FuseThread.h b/test/fspp/testutils/FuseThread.h
similarity index 92%
rename from test/testutils/FuseThread.h
rename to test/fspp/testutils/FuseThread.h
index b826f989..73666840 100644
--- a/test/testutils/FuseThread.h
+++ b/test/fspp/testutils/FuseThread.h
@@ -4,7 +4,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/chrono.hpp>
-#include <messmer/cpp-utils/macros.h>
+#include <cpp-utils/macros.h>
 
 namespace fspp {
 namespace fuse {
diff --git a/test/testutils/InMemoryFile.cpp b/test/fspp/testutils/InMemoryFile.cpp
similarity index 100%
rename from test/testutils/InMemoryFile.cpp
rename to test/fspp/testutils/InMemoryFile.cpp
diff --git a/test/testutils/InMemoryFile.h b/test/fspp/testutils/InMemoryFile.h
similarity index 95%
rename from test/testutils/InMemoryFile.h
rename to test/fspp/testutils/InMemoryFile.h
index 04c9f054..58adb9c0 100644
--- a/test/testutils/InMemoryFile.h
+++ b/test/fspp/testutils/InMemoryFile.h
@@ -2,7 +2,7 @@
 #ifndef MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
 #define MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
 
-#include <messmer/cpp-utils/data/Data.h>
+#include <cpp-utils/data/Data.h>
 
 class InMemoryFile {
 public:
diff --git a/test/main.cpp b/test/main.cpp
deleted file mode 100644
index ec4a5e33..00000000
--- a/test/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "google/gtest/gtest.h"
-#include <messmer/cpp-utils/assert/backtrace.h>
-
-int main(int argc, char **argv) {
-  cpputils::showBacktraceOnSigSegv();
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/utils.cmake b/utils.cmake
index b5cc1408..da284939 100644
--- a/utils.cmake
+++ b/utils.cmake
@@ -1,3 +1,5 @@
+include(CheckCXXCompilerFlag)
+
 ###################################################
 #  Activate C++14
 #
@@ -45,3 +47,18 @@ function(ADD_BOOST TARGET)
     target_include_directories(${TARGET} SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
     target_link_libraries(${TARGET} PRIVATE ${Boost_LIBRARIES})
 endfunction()
+
+##################################################
+# Specify that a specific minimal version of gcc is required
+#
+# Uses:
+#  REQUIRE_GCC_VERSION(4.9)
+##################################################
+function(REQUIRE_GCC_VERSION)
+    if (CMAKE_COMPILER_IS_GNUCXX)
+        execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+        if (GCC_VERSION VERSION_LESS ${ARGN})
+            message(FATAL_ERROR "Needs at least gcc version ${ARGN}, found gcc ${GCC_VERSION}")
+        endif (GCC_VERSION VERSION_LESS ${ARGN})
+    endif (CMAKE_COMPILER_IS_GNUCXX)
+endfunction()