diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7b7e18..e37be6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,43 +42,43 @@ set(EXTRA_CFLAGS
 )
 
 
-# libwsfs
-
-set(WSFS_SOURCES
-	lib/wsfs/status.c
-	lib/wsfs/filesystem.c
-	lib/wsfs/server.c
-	lib/wsfs/message.c
-	lib/wsfs/message_queue.c
-	lib/wsfs/time/timepoint.c
-	lib/wsfs/time/timer.c
-	lib/wsfs/time/timeout_manager.c
-	lib/wsfs/operation/lookup.c
-	lib/wsfs/operation/getattr.c
-	lib/wsfs/operation/readdir.c
-	lib/wsfs/operation/open.c
-	lib/wsfs/operation/close.c
-	lib/wsfs/operation/read.c
-	lib/wsfs/server_config.c
-	lib/wsfs/server_protocol.c
-	lib/wsfs/jsonrpc/server.c
-	lib/wsfs/jsonrpc/method.c
-	lib/wsfs/jsonrpc/request.c
-	lib/wsfs/jsonrpc/response.c
-	lib/wsfs/jsonrpc/util.c
+# libwsfs-adapter
+
+set(WSFS_ADAPTER_SOURCES
+	lib/wsfs/adapter/status.c
+	lib/wsfs/adapter/filesystem.c
+	lib/wsfs/adapter/server.c
+	lib/wsfs/adapter/message.c
+	lib/wsfs/adapter/message_queue.c
+	lib/wsfs/adapter/time/timepoint.c
+	lib/wsfs/adapter/time/timer.c
+	lib/wsfs/adapter/time/timeout_manager.c
+	lib/wsfs/adapter/operation/lookup.c
+	lib/wsfs/adapter/operation/getattr.c
+	lib/wsfs/adapter/operation/readdir.c
+	lib/wsfs/adapter/operation/open.c
+	lib/wsfs/adapter/operation/close.c
+	lib/wsfs/adapter/operation/read.c
+	lib/wsfs/adapter/server_config.c
+	lib/wsfs/adapter/server_protocol.c
+	lib/wsfs/adapter/jsonrpc/server.c
+	lib/wsfs/adapter/jsonrpc/method.c
+	lib/wsfs/adapter/jsonrpc/request.c
+	lib/wsfs/adapter/jsonrpc/response.c
+	lib/wsfs/adapter/jsonrpc/util.c
 )
 
-add_library(wsfs SHARED ${WSFS_SOURCES})
+add_library(wsfs-adapter SHARED ${WSFS_ADAPTER_SOURCES})
 
-set_target_properties(wsfs PROPERTIES VERSION ${PROJECT_VERSION})
-set_target_properties(wsfs PROPERTIES SOVERSION 0)
-set_target_properties(wsfs PROPERTIES C_VISIBILITY_PRESET hidden)
-set_target_properties(wsfs PROPERTIES COMPILE_DEFINITIONS "WSFS_API=WSFS_EXPORT")
+set_target_properties(wsfs-adapter PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(wsfs-adapter PROPERTIES SOVERSION 0)
+set_target_properties(wsfs-adapter PROPERTIES C_VISIBILITY_PRESET hidden)
+set_target_properties(wsfs-adapter PROPERTIES COMPILE_DEFINITIONS "WSFS_API=WSFS_EXPORT")
 
-target_include_directories(wsfs PUBLIC lib ${EXTRA_INCLUDE_DIRS})
-target_compile_options(wsfs PUBLIC  ${EXTRA_CFLAGS})
+target_include_directories(wsfs-adapter PUBLIC lib ${EXTRA_INCLUDE_DIRS})
+target_compile_options(wsfs-adapter PUBLIC  ${EXTRA_CFLAGS})
 
-file(WRITE "${PROJECT_BINARY_DIR}/libwsfs.pc"
+file(WRITE "${PROJECT_BINARY_DIR}/libwsfs-adapter.pc"
 "prefix=\"${CMAKE_INSTALL_PREFIX}\"
 exec_prefix=\${prefix}
 libdir=\${exec_prefix}/lib${LIB_SUFFIX}
@@ -87,30 +87,30 @@ Name: libwsfs
 Description: Websockets filesystem server library
 Version: ${PROJECT_VERSION}
 
-Libs: -L\${libdir} -lwsfs -l${FUSE3_LIBRARIES} -l${LWS_LIBRARIES} -l${JANSSON_LIBRARIES}
+Libs: -L\${libdir} -lwsfs-adapter -l${FUSE3_LIBRARIES} -l${LWS_LIBRARIES} -l${JANSSON_LIBRARIES}
 Cflags: -I\${includedir}"
 )
 
-install(TARGETS wsfs DESTINATION lib${LIB_SUFFIX})
-install(FILES include/wsfs.h DESTINATION include)
-install(DIRECTORY include/wsfs DESTINATION include)
-install(FILES "${PROJECT_BINARY_DIR}/libwsfs.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+install(TARGETS wsfs-adapter DESTINATION lib${LIB_SUFFIX})
+install(FILES include/wsfs_adapter.h DESTINATION include)
+install(DIRECTORY include/wsfs/adapter DESTINATION include/wsfs)
+install(FILES "${PROJECT_BINARY_DIR}/libwsfs-adapter.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
 #libwsfs-provider
 
 set(WSFS_PROVIDER_SOURCES
-	lib/wsfsp/url.c
-	lib/wsfsp/client.c
-	lib/wsfsp/client_protocol.c
-	lib/wsfsp/provider.c
-	lib/wsfsp/request.c
-	lib/wsfsp/operation/error.c
-	lib/wsfsp/operation/lookup.c
-	lib/wsfsp/operation/getattr.c
-	lib/wsfsp/operation/readdir.c
-	lib/wsfsp/operation/open.c
-	lib/wsfsp/operation/close.c
-	lib/wsfsp/operation/read.c
+	lib/wsfs/provider/url.c
+	lib/wsfs/provider/client.c
+	lib/wsfs/provider/client_protocol.c
+	lib/wsfs/provider/provider.c
+	lib/wsfs/provider/request.c
+	lib/wsfs/provider/operation/error.c
+	lib/wsfs/provider/operation/lookup.c
+	lib/wsfs/provider/operation/getattr.c
+	lib/wsfs/provider/operation/readdir.c
+	lib/wsfs/provider/operation/open.c
+	lib/wsfs/provider/operation/close.c
+	lib/wsfs/provider/operation/read.c
 )
 
 add_library(wsfs-provider SHARED ${WSFS_PROVIDER_SOURCES})
@@ -138,7 +138,7 @@ Cflags: -I\${includedir}"
 
 install(TARGETS wsfs-provider DESTINATION lib${LIB_SUFFIX})
 install(FILES include/wsfs_provider.h DESTINATION include)
-install(DIRECTORY include/wsfsp DESTINATION include)
+install(DIRECTORY include/wsfs/provider DESTINATION include/wsfs)
 install(FILES "${PROJECT_BINARY_DIR}/libwsfs-provider.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
 
@@ -152,7 +152,7 @@ add_executable(wsfsd
 	example/daemon/main.c
 )
 
-target_link_libraries(wsfsd PUBLIC wsfs ${EXTRA_LIBS})
+target_link_libraries(wsfsd PUBLIC wsfs-adapter ${EXTRA_LIBS})
 target_include_directories(wsfsd PUBLIC ${EXTRA_INCLUDE_DIRS})
 target_compile_options(wsfsd PUBLIC ${EXTRA_CFLAGS})
 
@@ -176,10 +176,10 @@ if(NOT WITHOUT_TESTS)
 
 pkg_check_modules(GTEST gtest_main)
 
-add_library(wsfs-static STATIC ${WSFS_SOURCES})
-set_target_properties(wsfs-static PROPERTIES OUTPUT_NAME wsfs)
-target_include_directories(wsfs-static PUBLIC lib ${EXTRA_INCLUDE_DIRS})
-target_compile_options(wsfs-static PUBLIC ${EXTRA_CFLAGS})
+add_library(wsfs-adapter-static STATIC ${WSFS_ADAPTER_SOURCES})
+set_target_properties(wsfs-adapter-static PROPERTIES OUTPUT_NAME wsfs-adapter)
+target_include_directories(wsfs-adapter-static PUBLIC lib ${EXTRA_INCLUDE_DIRS})
+target_compile_options(wsfs-adapter-static PUBLIC ${EXTRA_CFLAGS})
 
 add_library(wsfs-provider-static STATIC ${WSFS_PROVIDER_SOURCES})
 set_target_properties(wsfs-provider-static PROPERTIES OUTPUT_NAME wsfs-provider)
@@ -196,7 +196,7 @@ add_executable(alltests
 	test/test_url.cc
 )
 
-target_link_libraries(alltests PUBLIC wsfs-static wsfs-provider-static ${EXTRA_LIBS} ${GTEST_LIBRARIES})
+target_link_libraries(alltests PUBLIC wsfs-adapter-static wsfs-provider-static ${EXTRA_LIBS} ${GTEST_LIBRARIES})
 target_include_directories(alltests PUBLIC lib ${EXTRA_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})
 target_compile_options(alltests PUBLIC ${EXTRA_CFLAGS} ${GTEST_CFLAGS})
 
diff --git a/example/daemon/main.c b/example/daemon/main.c
index d0cfa9b..0964674 100644
--- a/example/daemon/main.c
+++ b/example/daemon/main.c
@@ -8,8 +8,7 @@
 #include <unistd.h>
 #include <getopt.h>
 
-#include "wsfs/server.h"
-#include "wsfs/server_config.h"
+#include <wsfs_adapter.h>
 
 struct args
 {
diff --git a/include/wsfs.h b/include/wsfs.h
deleted file mode 100644
index cd12a2e..0000000
--- a/include/wsfs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef WSFS_H
-#define WSFS_H
-
-#include <wsfs/api.h>
-#include <wsfs/server.h>
-#include <wsfs/server_config.h>
-#include <wsfs/server_protocol.h>
-
-#endif
diff --git a/include/wsfs/api.h b/include/wsfs/adapter/api.h
similarity index 100%
rename from include/wsfs/api.h
rename to include/wsfs/adapter/api.h
diff --git a/include/wsfs/server.h b/include/wsfs/adapter/server.h
similarity index 94%
rename from include/wsfs/server.h
rename to include/wsfs/adapter/server.h
index 6ab716d..b7aad3b 100644
--- a/include/wsfs/server.h
+++ b/include/wsfs/adapter/server.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_SERVER_H
 #define WSFS_SERVER_H
 
-#include "wsfs/api.h"
+#include "wsfs/adapter/api.h"
 
 struct wsfs_server;
 struct wsfs_server_config;
diff --git a/include/wsfs/server_config.h b/include/wsfs/adapter/server_config.h
similarity index 95%
rename from include/wsfs/server_config.h
rename to include/wsfs/adapter/server_config.h
index be9d953..10c1c28 100644
--- a/include/wsfs/server_config.h
+++ b/include/wsfs/adapter/server_config.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_SERVER_CONFIG_H
 #define WSFS_SERVER_CONFIG_H
 
-#include "wsfs/api.h"
+#include "wsfs/adapter/api.h"
 
 struct wsfs_server_config
 {
diff --git a/include/wsfs/server_protocol.h b/include/wsfs/adapter/server_protocol.h
similarity index 94%
rename from include/wsfs/server_protocol.h
rename to include/wsfs/adapter/server_protocol.h
index 61b575f..aef0a78 100644
--- a/include/wsfs/server_protocol.h
+++ b/include/wsfs/adapter/server_protocol.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_SERVER_PROTOCOL_H
 #define WSFS_SERVER_PROTOCOL_H
 
-#include "wsfs/api.h"
+#include "wsfs/adapter/api.h"
 
 struct wsfs_server_protocol;
 struct lws_protocols;
diff --git a/include/wsfsp/api.h b/include/wsfs/provider/api.h
similarity index 100%
rename from include/wsfsp/api.h
rename to include/wsfs/provider/api.h
diff --git a/include/wsfsp/client.h b/include/wsfs/provider/client.h
similarity index 96%
rename from include/wsfsp/client.h
rename to include/wsfs/provider/client.h
index 7c2e8bb..b339054 100644
--- a/include/wsfsp/client.h
+++ b/include/wsfs/provider/client.h
@@ -1,7 +1,7 @@
 #ifndef WSFSP_CLIENT_H
 #define WSFSP_CLIENT_H
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_provider;
 struct wsfsp_client;
diff --git a/include/wsfsp/client_protocol.h b/include/wsfs/provider/client_protocol.h
similarity index 95%
rename from include/wsfsp/client_protocol.h
rename to include/wsfs/provider/client_protocol.h
index f3ca91f..d28039c 100644
--- a/include/wsfsp/client_protocol.h
+++ b/include/wsfs/provider/client_protocol.h
@@ -1,7 +1,7 @@
 #ifndef WSFSP_CLIENT_PROTOCOL_H
 #define WSFSP_CLIENT_PROTOCOL_H
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_client_protocol;
 struct wsfsp_provider;
diff --git a/include/wsfsp/dirbuffer.h b/include/wsfs/provider/dirbuffer.h
similarity index 94%
rename from include/wsfsp/dirbuffer.h
rename to include/wsfs/provider/dirbuffer.h
index 282d6e0..aa562d8 100644
--- a/include/wsfsp/dirbuffer.h
+++ b/include/wsfs/provider/dirbuffer.h
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_dirbuffer;
 
diff --git a/include/wsfsp/operation/close.h b/include/wsfs/provider/operation/close.h
similarity index 92%
rename from include/wsfsp/operation/close.h
rename to include/wsfs/provider/operation/close.h
index 95f79b6..aba4709 100644
--- a/include/wsfsp/operation/close.h
+++ b/include/wsfs/provider/operation/close.h
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 typedef void wsfsp_close_fn(
     ino_t inode,
diff --git a/include/wsfsp/operation/error.h b/include/wsfs/provider/operation/error.h
similarity index 89%
rename from include/wsfsp/operation/error.h
rename to include/wsfs/provider/operation/error.h
index c29f4b7..c2a8567 100644
--- a/include/wsfsp/operation/error.h
+++ b/include/wsfs/provider/operation/error.h
@@ -1,7 +1,7 @@
 #ifndef WSFSP_OPERATION_ERROR_H
 #define WSFSP_OPERATION_ERROR_H
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 
diff --git a/include/wsfsp/operation/getattr.h b/include/wsfs/provider/operation/getattr.h
similarity index 93%
rename from include/wsfsp/operation/getattr.h
rename to include/wsfs/provider/operation/getattr.h
index c4a66e8..ee7e9fb 100644
--- a/include/wsfsp/operation/getattr.h
+++ b/include/wsfs/provider/operation/getattr.h
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 
diff --git a/include/wsfsp/operation/lookup.h b/include/wsfs/provider/operation/lookup.h
similarity index 93%
rename from include/wsfsp/operation/lookup.h
rename to include/wsfs/provider/operation/lookup.h
index 4007f18..8e529c7 100644
--- a/include/wsfsp/operation/lookup.h
+++ b/include/wsfs/provider/operation/lookup.h
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 
diff --git a/include/wsfsp/operation/open.h b/include/wsfs/provider/operation/open.h
similarity index 94%
rename from include/wsfsp/operation/open.h
rename to include/wsfs/provider/operation/open.h
index 70b3eff..ad471de 100644
--- a/include/wsfsp/operation/open.h
+++ b/include/wsfs/provider/operation/open.h
@@ -11,7 +11,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 
diff --git a/include/wsfsp/operation/read.h b/include/wsfs/provider/operation/read.h
similarity index 95%
rename from include/wsfsp/operation/read.h
rename to include/wsfs/provider/operation/read.h
index cf01335..efe1963 100644
--- a/include/wsfsp/operation/read.h
+++ b/include/wsfs/provider/operation/read.h
@@ -14,7 +14,7 @@ using std::size_t;
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_request;
 
diff --git a/include/wsfsp/operation/readdir.h b/include/wsfs/provider/operation/readdir.h
similarity index 94%
rename from include/wsfsp/operation/readdir.h
rename to include/wsfs/provider/operation/readdir.h
index 9eb20a5..4dd40da 100644
--- a/include/wsfsp/operation/readdir.h
+++ b/include/wsfs/provider/operation/readdir.h
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfsp/api.h"
+#include "wsfs/provider/api.h"
 
 struct wsfsp_dirbuffer;
 struct wsfsp_request;
diff --git a/include/wsfsp/provider.h b/include/wsfs/provider/provider.h
similarity index 67%
rename from include/wsfsp/provider.h
rename to include/wsfs/provider/provider.h
index 75cf92b..b2108ee 100644
--- a/include/wsfsp/provider.h
+++ b/include/wsfs/provider/provider.h
@@ -1,12 +1,12 @@
 #ifndef WSFSP_PROVIDER_H
 #define WSFSP_PROVIDER_H
 
-#include <wsfsp/operation/lookup.h>
-#include <wsfsp/operation/getattr.h>
-#include <wsfsp/operation/readdir.h>
-#include <wsfsp/operation/open.h>
-#include <wsfsp/operation/close.h>
-#include <wsfsp/operation/read.h>
+#include <wsfs/provider/operation/lookup.h>
+#include <wsfs/provider/operation/getattr.h>
+#include <wsfs/provider/operation/readdir.h>
+#include <wsfs/provider/operation/open.h>
+#include <wsfs/provider/operation/close.h>
+#include <wsfs/provider/operation/read.h>
 
 typedef void wsfsp_connected_fn(
     void * user_data);
diff --git a/include/wsfs_adapter.h b/include/wsfs_adapter.h
new file mode 100644
index 0000000..583dc32
--- /dev/null
+++ b/include/wsfs_adapter.h
@@ -0,0 +1,9 @@
+#ifndef WSFS_H
+#define WSFS_H
+
+#include <wsfs/adapter/api.h>
+#include <wsfs/adapter/server.h>
+#include <wsfs/adapter/server_config.h>
+#include <wsfs/adapter/server_protocol.h>
+
+#endif
diff --git a/include/wsfs_provider.h b/include/wsfs_provider.h
index f925e6f..49ce3a2 100644
--- a/include/wsfs_provider.h
+++ b/include/wsfs_provider.h
@@ -1,18 +1,18 @@
 #ifndef WSFSP_H
 #define WSFSP_H
 
-#include <wsfsp/api.h>
-#include <wsfsp/client.h>
-#include <wsfsp/client_protocol.h>
-#include <wsfsp/provider.h>
-#include <wsfsp/dirbuffer.h>
+#include <wsfs/provider/api.h>
+#include <wsfs/provider/client.h>
+#include <wsfs/provider/client_protocol.h>
+#include <wsfs/provider/provider.h>
+#include <wsfs/provider/dirbuffer.h>
 
-#include <wsfsp/operation/error.h>
-#include <wsfsp/operation/lookup.h>
-#include <wsfsp/operation/getattr.h>
-#include <wsfsp/operation/readdir.h>
-#include <wsfsp/operation/open.h>
-#include <wsfsp/operation/close.h>
-#include <wsfsp/operation/read.h>
+#include <wsfs/provider/operation/error.h>
+#include <wsfs/provider/operation/lookup.h>
+#include <wsfs/provider/operation/getattr.h>
+#include <wsfs/provider/operation/readdir.h>
+#include <wsfs/provider/operation/open.h>
+#include <wsfs/provider/operation/close.h>
+#include <wsfs/provider/operation/read.h>
 
 #endif
diff --git a/lib/wsfs/filesystem.c b/lib/wsfs/adapter/filesystem.c
similarity index 94%
rename from lib/wsfs/filesystem.c
rename to lib/wsfs/adapter/filesystem.c
index aadd29b..db62c99 100644
--- a/lib/wsfs/filesystem.c
+++ b/lib/wsfs/adapter/filesystem.c
@@ -1,6 +1,6 @@
-#include "wsfs/filesystem.h"
-#include "wsfs/operations.h"
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/filesystem.h"
+#include "wsfs/adapter/operations.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 
 #include <stddef.h>
 #include <string.h>
diff --git a/lib/wsfs/filesystem.h b/lib/wsfs/adapter/filesystem.h
similarity index 90%
rename from lib/wsfs/filesystem.h
rename to lib/wsfs/adapter/filesystem.h
index 6cdca70..f238afc 100644
--- a/lib/wsfs/filesystem.h
+++ b/lib/wsfs/adapter/filesystem.h
@@ -5,8 +5,8 @@
 #include <stdbool.h>
 #endif
 
-#include "wsfs/fuse_wrapper.h"
-#include "wsfs/operations.h"
+#include "wsfs/adapter/fuse_wrapper.h"
+#include "wsfs/adapter/operations.h"
 
 struct wsfs_jsonrpc_server;
 
diff --git a/lib/wsfs/fuse_wrapper.h b/lib/wsfs/adapter/fuse_wrapper.h
similarity index 100%
rename from lib/wsfs/fuse_wrapper.h
rename to lib/wsfs/adapter/fuse_wrapper.h
diff --git a/lib/wsfs/jsonrpc/method.c b/lib/wsfs/adapter/jsonrpc/method.c
similarity index 92%
rename from lib/wsfs/jsonrpc/method.c
rename to lib/wsfs/adapter/jsonrpc/method.c
index e82a985..c762d1a 100644
--- a/lib/wsfs/jsonrpc/method.c
+++ b/lib/wsfs/adapter/jsonrpc/method.c
@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/method_intern.h"
+#include "wsfs/adapter/jsonrpc/method_intern.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/wsfs/jsonrpc/method.h b/lib/wsfs/adapter/jsonrpc/method.h
similarity index 91%
rename from lib/wsfs/jsonrpc/method.h
rename to lib/wsfs/adapter/jsonrpc/method.h
index f8c7b45..0c836a6 100644
--- a/lib/wsfs/jsonrpc/method.h
+++ b/lib/wsfs/adapter/jsonrpc/method.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 
 typedef bool wsfs_jsonrpc_method_invoke_fn(
diff --git a/lib/wsfs/jsonrpc/method_intern.h b/lib/wsfs/adapter/jsonrpc/method_intern.h
similarity index 93%
rename from lib/wsfs/jsonrpc/method_intern.h
rename to lib/wsfs/adapter/jsonrpc/method_intern.h
index b23281e..b54a396 100644
--- a/lib/wsfs/jsonrpc/method_intern.h
+++ b/lib/wsfs/adapter/jsonrpc/method_intern.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_JSONRPC_METHOD_INTERN_H
 #define WSFS_JSONRPC_METHOD_INTERN_H
 
-#include "wsfs/jsonrpc/method.h"
+#include "wsfs/adapter/jsonrpc/method.h"
 
 struct wsfs_jsonrpc_method
 {
diff --git a/lib/wsfs/jsonrpc/request.c b/lib/wsfs/adapter/jsonrpc/request.c
similarity index 95%
rename from lib/wsfs/jsonrpc/request.c
rename to lib/wsfs/adapter/jsonrpc/request.c
index eca02e2..04c3605 100644
--- a/lib/wsfs/jsonrpc/request.c
+++ b/lib/wsfs/adapter/jsonrpc/request.c
@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/request.h"
+#include "wsfs/adapter/jsonrpc/request.h"
 
 json_t * wsfs_jsonrpc_request_create(
 	char const * method,
diff --git a/lib/wsfs/jsonrpc/request.h b/lib/wsfs/adapter/jsonrpc/request.h
similarity index 100%
rename from lib/wsfs/jsonrpc/request.h
rename to lib/wsfs/adapter/jsonrpc/request.h
diff --git a/lib/wsfs/jsonrpc/response.c b/lib/wsfs/adapter/jsonrpc/response.c
similarity index 96%
rename from lib/wsfs/jsonrpc/response.c
rename to lib/wsfs/adapter/jsonrpc/response.c
index e05ffe9..95fe840 100644
--- a/lib/wsfs/jsonrpc/response.c
+++ b/lib/wsfs/adapter/jsonrpc/response.c
@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/response.h"
+#include "wsfs/adapter/jsonrpc/response.h"
 
 void wsfs_jsonrpc_response_init(
 	struct wsfs_jsonrpc_response * result,
diff --git a/lib/wsfs/jsonrpc/response.h b/lib/wsfs/adapter/jsonrpc/response.h
similarity index 94%
rename from lib/wsfs/jsonrpc/response.h
rename to lib/wsfs/adapter/jsonrpc/response.h
index b1f217b..e9ab5ea 100644
--- a/lib/wsfs/jsonrpc/response.h
+++ b/lib/wsfs/adapter/jsonrpc/response.h
@@ -9,7 +9,7 @@ using std::size_t;
 #endif
 
 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 struct wsfs_jsonrpc_response
 {
diff --git a/lib/wsfs/jsonrpc/server.c b/lib/wsfs/adapter/jsonrpc/server.c
similarity index 96%
rename from lib/wsfs/jsonrpc/server.c
rename to lib/wsfs/adapter/jsonrpc/server.c
index 4ac622c..047effa 100644
--- a/lib/wsfs/jsonrpc/server.c
+++ b/lib/wsfs/adapter/jsonrpc/server.c
@@ -1,9 +1,9 @@
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include <string.h>
 
-#include "wsfs/jsonrpc/method_intern.h"
-#include "wsfs/jsonrpc/request.h"
-#include "wsfs/jsonrpc/response.h"
+#include "wsfs/adapter/jsonrpc/method_intern.h"
+#include "wsfs/adapter/jsonrpc/request.h"
+#include "wsfs/adapter/jsonrpc/response.h"
 
 #define WSFS_DEFAULT_TIMEOUT (10 * 1000)
 
diff --git a/lib/wsfs/jsonrpc/server.h b/lib/wsfs/adapter/jsonrpc/server.h
similarity index 92%
rename from lib/wsfs/jsonrpc/server.h
rename to lib/wsfs/adapter/jsonrpc/server.h
index e21ef62..7f1ef09 100644
--- a/lib/wsfs/jsonrpc/server.h
+++ b/lib/wsfs/adapter/jsonrpc/server.h
@@ -12,9 +12,9 @@ using std::size_t;
 #endif
 
 #include <jansson.h>
-#include "wsfs/jsonrpc/method.h"
-#include "wsfs/time/timeout_manager.h"
-#include "wsfs/time/timer.h"
+#include "wsfs/adapter/jsonrpc/method.h"
+#include "wsfs/adapter/time/timeout_manager.h"
+#include "wsfs/adapter/time/timer.h"
 
 
 struct wsfs_jsonrpc_request
diff --git a/lib/wsfs/jsonrpc/util.c b/lib/wsfs/adapter/jsonrpc/util.c
similarity index 87%
rename from lib/wsfs/jsonrpc/util.c
rename to lib/wsfs/adapter/jsonrpc/util.c
index 571f8a9..c43b430 100644
--- a/lib/wsfs/jsonrpc/util.c
+++ b/lib/wsfs/adapter/jsonrpc/util.c
@@ -1,4 +1,4 @@
-#include "wsfs/jsonrpc/util.h"
+#include "wsfs/adapter/jsonrpc/util.h"
 
 int wsfs_json_get_int(json_t const * object, char const * key, int default_value)
 {
diff --git a/lib/wsfs/jsonrpc/util.h b/lib/wsfs/adapter/jsonrpc/util.h
similarity index 100%
rename from lib/wsfs/jsonrpc/util.h
rename to lib/wsfs/adapter/jsonrpc/util.h
diff --git a/lib/wsfs/message.c b/lib/wsfs/adapter/message.c
similarity index 93%
rename from lib/wsfs/message.c
rename to lib/wsfs/adapter/message.c
index eedd392..379b637 100644
--- a/lib/wsfs/message.c
+++ b/lib/wsfs/adapter/message.c
@@ -1,4 +1,4 @@
-#include "wsfs/message.h"
+#include "wsfs/adapter/message.h"
 
 #include <stdlib.h>
 #include <libwebsockets.h>
diff --git a/lib/wsfs/message.h b/lib/wsfs/adapter/message.h
similarity index 100%
rename from lib/wsfs/message.h
rename to lib/wsfs/adapter/message.h
diff --git a/lib/wsfs/message_queue.c b/lib/wsfs/adapter/message_queue.c
similarity index 94%
rename from lib/wsfs/message_queue.c
rename to lib/wsfs/adapter/message_queue.c
index 08b7e5e..6fb0e22 100644
--- a/lib/wsfs/message_queue.c
+++ b/lib/wsfs/adapter/message_queue.c
@@ -1,5 +1,5 @@
-#include "wsfs/message_queue.h"
-#include "wsfs/message.h"
+#include "wsfs/adapter/message_queue.h"
+#include "wsfs/adapter/message.h"
 
 void wsfs_message_queue_init(
     struct wsfs_message_queue * queue)
diff --git a/lib/wsfs/message_queue.h b/lib/wsfs/adapter/message_queue.h
similarity index 100%
rename from lib/wsfs/message_queue.h
rename to lib/wsfs/adapter/message_queue.h
diff --git a/lib/wsfs/operation/close.c b/lib/wsfs/adapter/operation/close.c
similarity index 86%
rename from lib/wsfs/operation/close.c
rename to lib/wsfs/adapter/operation/close.c
index b2d9385..7c6593f 100644
--- a/lib/wsfs/operation/close.c
+++ b/lib/wsfs/adapter/operation/close.c
@@ -1,10 +1,10 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <limits.h>
 #include <errno.h>
 #include <jansson.h>
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include "wsfs/util.h"
 
 void wsfs_operation_close(
diff --git a/lib/wsfs/operation/getattr.c b/lib/wsfs/adapter/operation/getattr.c
similarity index 95%
rename from lib/wsfs/operation/getattr.c
rename to lib/wsfs/adapter/operation/getattr.c
index 2c25858..a11f225 100644
--- a/lib/wsfs/operation/getattr.c
+++ b/lib/wsfs/adapter/operation/getattr.c
@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <errno.h>
 #include <string.h>
@@ -7,8 +7,8 @@
 #include <sys/stat.h>
 #include <unistd.h> 
 
-#include "wsfs/jsonrpc/server.h"
-#include "wsfs/jsonrpc/util.h"
+#include "wsfs/adapter/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/util.h"
 #include "wsfs/util.h"
 
 struct wsfs_operation_getattr_context
diff --git a/lib/wsfs/operation/lookup.c b/lib/wsfs/adapter/operation/lookup.c
similarity index 95%
rename from lib/wsfs/operation/lookup.c
rename to lib/wsfs/adapter/operation/lookup.c
index 46f6042..2d70ea8 100644
--- a/lib/wsfs/operation/lookup.c
+++ b/lib/wsfs/adapter/operation/lookup.c
@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <limits.h>
 #include <errno.h>
@@ -10,8 +10,8 @@
 
 #include <stdlib.h>
 
-#include "wsfs/jsonrpc/server.h"
-#include "wsfs/jsonrpc/util.h"
+#include "wsfs/adapter/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/util.h"
 #include "wsfs/util.h"
 
 struct wsfs_operation_lookup_context
diff --git a/lib/wsfs/operation/open.c b/lib/wsfs/adapter/operation/open.c
similarity index 91%
rename from lib/wsfs/operation/open.c
rename to lib/wsfs/adapter/operation/open.c
index d3eb65a..ed86c69 100644
--- a/lib/wsfs/operation/open.c
+++ b/lib/wsfs/adapter/operation/open.c
@@ -1,12 +1,12 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <string.h>
 #include <errno.h>
 #include <jansson.h>
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include "wsfs/util.h"
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 static void wsfs_operation_open_finished(
 	void * user_data,
diff --git a/lib/wsfs/operation/read.c b/lib/wsfs/adapter/operation/read.c
similarity index 96%
rename from lib/wsfs/operation/read.c
rename to lib/wsfs/adapter/operation/read.c
index 5b2da6c..ebbd1ab 100644
--- a/lib/wsfs/operation/read.c
+++ b/lib/wsfs/adapter/operation/read.c
@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <errno.h>
 #include <string.h>
@@ -6,7 +6,7 @@
 #include <jansson.h>
 #include <libwebsockets.h>
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 
 #define WSFS_MAX_READ_LENGTH 4096
 
diff --git a/lib/wsfs/operation/readdir.c b/lib/wsfs/adapter/operation/readdir.c
similarity index 97%
rename from lib/wsfs/operation/readdir.c
rename to lib/wsfs/adapter/operation/readdir.c
index ce02472..2d9831f 100644
--- a/lib/wsfs/operation/readdir.c
+++ b/lib/wsfs/adapter/operation/readdir.c
@@ -1,4 +1,4 @@
-#include "wsfs/operations.h"
+#include "wsfs/adapter/operations.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <unistd.h> 
 
-#include "wsfs/jsonrpc/server.h"
+#include "wsfs/adapter/jsonrpc/server.h"
 #include "wsfs/util.h"
 
 
diff --git a/lib/wsfs/operations.h b/lib/wsfs/adapter/operations.h
similarity index 96%
rename from lib/wsfs/operations.h
rename to lib/wsfs/adapter/operations.h
index e0ccb33..afddbfc 100644
--- a/lib/wsfs/operations.h
+++ b/lib/wsfs/adapter/operations.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_OPERATIONS
 #define WSFS_OPERATIONS
 
-#include "wsfs/fuse_wrapper.h"
+#include "wsfs/adapter/fuse_wrapper.h"
 
 struct wsfs_jsonrpc_server;
 
diff --git a/lib/wsfs/server.c b/lib/wsfs/adapter/server.c
similarity index 96%
rename from lib/wsfs/server.c
rename to lib/wsfs/adapter/server.c
index f533540..2590f0d 100644
--- a/lib/wsfs/server.c
+++ b/lib/wsfs/adapter/server.c
@@ -1,11 +1,11 @@
-#include "wsfs/server.h"
+#include "wsfs/adapter/server.h"
 
 #include <stdlib.h>
 #include <stdbool.h>
 #include <libwebsockets.h>
 
-#include "wsfs/server_config.h"
-#include "wsfs/server_protocol_intern.h"
+#include "wsfs/adapter/server_config.h"
+#include "wsfs/adapter/server_protocol_intern.h"
 
 #define WSFS_DISABLE_LWS_LOG 0
 #define WSFS_SERVER_PROTOCOL_COUNT 3
diff --git a/lib/wsfs/server_config.c b/lib/wsfs/adapter/server_config.c
similarity index 96%
rename from lib/wsfs/server_config.c
rename to lib/wsfs/adapter/server_config.c
index 1366a4d..8f88a17 100644
--- a/lib/wsfs/server_config.c
+++ b/lib/wsfs/adapter/server_config.c
@@ -1,4 +1,4 @@
-#include "wsfs/server_config.h"
+#include "wsfs/adapter/server_config.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/wsfs/server_protocol.c b/lib/wsfs/adapter/server_protocol.c
similarity index 97%
rename from lib/wsfs/server_protocol.c
rename to lib/wsfs/adapter/server_protocol.c
index b1edea6..3db067e 100644
--- a/lib/wsfs/server_protocol.c
+++ b/lib/wsfs/adapter/server_protocol.c
@@ -1,10 +1,10 @@
-#include "wsfs/server_protocol_intern.h"
+#include "wsfs/adapter/server_protocol_intern.h"
 
 #include <stdlib.h>
 #include <libwebsockets.h>
 
-#include "wsfs/message.h"
-#include "wsfs/filesystem.h"
+#include "wsfs/adapter/message.h"
+#include "wsfs/adapter/filesystem.h"
 #include "wsfs/util.h"
 
 static int wsfs_server_protocol_callback(
diff --git a/lib/wsfs/server_protocol_intern.h b/lib/wsfs/adapter/server_protocol_intern.h
similarity index 70%
rename from lib/wsfs/server_protocol_intern.h
rename to lib/wsfs/adapter/server_protocol_intern.h
index e979e17..7931411 100644
--- a/lib/wsfs/server_protocol_intern.h
+++ b/lib/wsfs/adapter/server_protocol_intern.h
@@ -1,11 +1,11 @@
 #ifndef WSFS_SERVER_PROTOCOL_INTERN_H
 #define WSFS_SERVER_PROTOCOL_INTERN_H
 
-#include "wsfs/server_protocol.h"
-#include "wsfs/filesystem.h"
-#include "wsfs/message_queue.h"
-#include "wsfs/jsonrpc/server.h"
-#include "wsfs/time/timeout_manager.h"
+#include "wsfs/adapter/server_protocol.h"
+#include "wsfs/adapter/filesystem.h"
+#include "wsfs/adapter/message_queue.h"
+#include "wsfs/adapter/jsonrpc/server.h"
+#include "wsfs/adapter/time/timeout_manager.h"
 
 struct wsfs_server_protocol
 {
diff --git a/lib/wsfs/status.c b/lib/wsfs/adapter/status.c
similarity index 96%
rename from lib/wsfs/status.c
rename to lib/wsfs/adapter/status.c
index f8a5e79..44db17b 100644
--- a/lib/wsfs/status.c
+++ b/lib/wsfs/adapter/status.c
@@ -1,4 +1,4 @@
-#include "wsfs/status.h"
+#include "wsfs/adapter/status.h"
 
 #include <errno.h>
 
diff --git a/lib/wsfs/status.h b/lib/wsfs/adapter/status.h
similarity index 100%
rename from lib/wsfs/status.h
rename to lib/wsfs/adapter/status.h
diff --git a/lib/wsfs/time/timeout_manager.c b/lib/wsfs/adapter/time/timeout_manager.c
similarity index 91%
rename from lib/wsfs/time/timeout_manager.c
rename to lib/wsfs/adapter/time/timeout_manager.c
index 361ac49..d0c223a 100644
--- a/lib/wsfs/time/timeout_manager.c
+++ b/lib/wsfs/adapter/time/timeout_manager.c
@@ -1,8 +1,8 @@
-#include "wsfs/time/timeout_manager_intern.h"
+#include "wsfs/adapter/time/timeout_manager_intern.h"
 
 #include <stddef.h>
-#include "wsfs/time/timer_intern.h"
-#include "wsfs/time/timepoint.h"
+#include "wsfs/adapter/time/timer_intern.h"
+#include "wsfs/adapter/time/timepoint.h"
 
 void wsfs_timeout_manager_init(
     struct wsfs_timeout_manager * manager)
diff --git a/lib/wsfs/time/timeout_manager.h b/lib/wsfs/adapter/time/timeout_manager.h
similarity index 100%
rename from lib/wsfs/time/timeout_manager.h
rename to lib/wsfs/adapter/time/timeout_manager.h
diff --git a/lib/wsfs/time/timeout_manager_intern.h b/lib/wsfs/adapter/time/timeout_manager_intern.h
similarity index 89%
rename from lib/wsfs/time/timeout_manager_intern.h
rename to lib/wsfs/adapter/time/timeout_manager_intern.h
index 2ef4228..e9bcaec 100644
--- a/lib/wsfs/time/timeout_manager_intern.h
+++ b/lib/wsfs/adapter/time/timeout_manager_intern.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
 #define WSFS_TIME_TIMEOUT_MANAGER_INTERN_H
 
-#include "wsfs/time/timeout_manager.h"
+#include "wsfs/adapter/time/timeout_manager.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfs/time/timepoint.c b/lib/wsfs/adapter/time/timepoint.c
similarity index 95%
rename from lib/wsfs/time/timepoint.c
rename to lib/wsfs/adapter/time/timepoint.c
index 9949d79..0d14783 100644
--- a/lib/wsfs/time/timepoint.c
+++ b/lib/wsfs/adapter/time/timepoint.c
@@ -1,4 +1,4 @@
-#include "wsfs/time/timepoint.h"
+#include "wsfs/adapter/time/timepoint.h"
 
 #include <time.h>
 
diff --git a/lib/wsfs/time/timepoint.h b/lib/wsfs/adapter/time/timepoint.h
similarity index 100%
rename from lib/wsfs/time/timepoint.h
rename to lib/wsfs/adapter/time/timepoint.h
diff --git a/lib/wsfs/time/timer.c b/lib/wsfs/adapter/time/timer.c
similarity index 92%
rename from lib/wsfs/time/timer.c
rename to lib/wsfs/adapter/time/timer.c
index 4f1d00b..7797cec 100644
--- a/lib/wsfs/time/timer.c
+++ b/lib/wsfs/adapter/time/timer.c
@@ -1,5 +1,5 @@
-#include "wsfs/time/timer_intern.h"
-#include "wsfs/time/timeout_manager_intern.h"
+#include "wsfs/adapter/time/timer_intern.h"
+#include "wsfs/adapter/time/timeout_manager_intern.h"
 
 #include <stddef.h>
 #include <string.h>
diff --git a/lib/wsfs/time/timer.h b/lib/wsfs/adapter/time/timer.h
similarity index 95%
rename from lib/wsfs/time/timer.h
rename to lib/wsfs/adapter/time/timer.h
index ba983ef..76446ac 100644
--- a/lib/wsfs/time/timer.h
+++ b/lib/wsfs/adapter/time/timer.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_TIMER_H
 #define WSFS_TIMER_H
 
-#include "wsfs/time/timepoint.h"
+#include "wsfs/adapter/time/timepoint.h"
 
 struct wsfs_timer;
 struct wsfs_timeout_manager;
diff --git a/lib/wsfs/time/timer_intern.h b/lib/wsfs/adapter/time/timer_intern.h
similarity index 89%
rename from lib/wsfs/time/timer_intern.h
rename to lib/wsfs/adapter/time/timer_intern.h
index 73e3068..454f745 100644
--- a/lib/wsfs/time/timer_intern.h
+++ b/lib/wsfs/adapter/time/timer_intern.h
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #endif
 
-#include "wsfs/time/timer.h"
+#include "wsfs/adapter/time/timer.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfsp/client.c b/lib/wsfs/provider/client.c
similarity index 95%
rename from lib/wsfsp/client.c
rename to lib/wsfs/provider/client.c
index 4a2777d..d3698fb 100644
--- a/lib/wsfsp/client.c
+++ b/lib/wsfs/provider/client.c
@@ -1,4 +1,4 @@
-#include "wsfsp/client.h"
+#include "wsfs/provider/client.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -6,9 +6,9 @@
 
 #include <libwebsockets.h>
 
-#include "wsfsp/provider.h"
-#include "wsfsp/client_protocol_intern.h"
-#include "wsfsp/url.h"
+#include "wsfs/provider/provider.h"
+#include "wsfs/provider/client_protocol_intern.h"
+#include "wsfs/provider/url.h"
 
 #define WSFSP_PROTOCOL ("fs")
 #define WSFSP_DISABLE_LWS_LOG 0
diff --git a/lib/wsfsp/client_protocol.c b/lib/wsfs/provider/client_protocol.c
similarity index 91%
rename from lib/wsfsp/client_protocol.c
rename to lib/wsfs/provider/client_protocol.c
index 999b5bc..9ed0560 100644
--- a/lib/wsfsp/client_protocol.c
+++ b/lib/wsfs/provider/client_protocol.c
@@ -1,4 +1,4 @@
-#include "wsfsp/client_protocol_intern.h"
+#include "wsfs/provider/client_protocol_intern.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -7,13 +7,13 @@
 #include <jansson.h>
 
 
-#include "wsfsp/provider_intern.h"
-#include "wsfsp/operation/lookup_intern.h"
-#include "wsfsp/operation/getattr_intern.h"
-#include "wsfsp/operation/readdir_intern.h"
-#include "wsfsp/operation/open_intern.h"
-#include "wsfsp/operation/close_intern.h"
-#include "wsfsp/operation/read_intern.h"
+#include "wsfs/provider/provider_intern.h"
+#include "wsfs/provider/operation/lookup_intern.h"
+#include "wsfs/provider/operation/getattr_intern.h"
+#include "wsfs/provider/operation/readdir_intern.h"
+#include "wsfs/provider/operation/open_intern.h"
+#include "wsfs/provider/operation/close_intern.h"
+#include "wsfs/provider/operation/read_intern.h"
 
 #include "wsfs/util.h"
 
diff --git a/lib/wsfsp/client_protocol_intern.h b/lib/wsfs/provider/client_protocol_intern.h
similarity index 82%
rename from lib/wsfsp/client_protocol_intern.h
rename to lib/wsfs/provider/client_protocol_intern.h
index 6a77951..ac05e3c 100644
--- a/lib/wsfsp/client_protocol_intern.h
+++ b/lib/wsfs/provider/client_protocol_intern.h
@@ -1,9 +1,9 @@
 #ifndef WSFSP_CLIENT_PROTOCOL_INTERN_H
 #define WSFSP_CLIENT_PROTOCOL_INTERN_H
 
-#include "wsfsp/client_protocol.h"
-#include "wsfsp/provider.h"
-#include "wsfsp/request.h"
+#include "wsfs/provider/client_protocol.h"
+#include "wsfs/provider/provider.h"
+#include "wsfs/provider/request.h"
 
 struct wsfsp_client_protocol
 {
diff --git a/lib/wsfsp/operation/close.c b/lib/wsfs/provider/operation/close.c
similarity index 95%
rename from lib/wsfsp/operation/close.c
rename to lib/wsfs/provider/operation/close.c
index 0d90062..e8a7d12 100644
--- a/lib/wsfsp/operation/close.c
+++ b/lib/wsfs/provider/operation/close.c
@@ -1,4 +1,4 @@
-#include "wsfsp/operation/close_intern.h"
+#include "wsfs/provider/operation/close_intern.h"
 #include <limits.h>
 #include "wsfs/util.h"
 
diff --git a/lib/wsfsp/operation/close_intern.h b/lib/wsfs/provider/operation/close_intern.h
similarity index 79%
rename from lib/wsfsp/operation/close_intern.h
rename to lib/wsfs/provider/operation/close_intern.h
index 3ce8fe6..53b1d7a 100644
--- a/lib/wsfsp/operation/close_intern.h
+++ b/lib/wsfs/provider/operation/close_intern.h
@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_CLOSE_INTERN_H
 #define WSFSP_OPERATION_CLOSE_INTERN_H
 
-#include "wsfsp/operation/close.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/close.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfsp/operation/error.c b/lib/wsfs/provider/operation/error.c
similarity index 85%
rename from lib/wsfsp/operation/error.c
rename to lib/wsfs/provider/operation/error.c
index c26b7e2..da01a89 100644
--- a/lib/wsfsp/operation/error.c
+++ b/lib/wsfs/provider/operation/error.c
@@ -1,6 +1,6 @@
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 #include <jansson.h>
-#include "wsfsp/request.h"
+#include "wsfs/provider/request.h"
 
 void wsfsp_respond_error(
     struct wsfsp_request * request,
diff --git a/lib/wsfsp/operation/getattr.c b/lib/wsfs/provider/operation/getattr.c
similarity index 90%
rename from lib/wsfsp/operation/getattr.c
rename to lib/wsfs/provider/operation/getattr.c
index 62827b0..9a4d2f4 100644
--- a/lib/wsfsp/operation/getattr.c
+++ b/lib/wsfs/provider/operation/getattr.c
@@ -1,7 +1,7 @@
-#include "wsfsp/operation/getattr_intern.h"
+#include "wsfs/provider/operation/getattr_intern.h"
 #include <stdio.h>
 
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 
 void wsfsp_getattr(
diff --git a/lib/wsfsp/operation/getattr_intern.h b/lib/wsfs/provider/operation/getattr_intern.h
similarity index 79%
rename from lib/wsfsp/operation/getattr_intern.h
rename to lib/wsfs/provider/operation/getattr_intern.h
index 7d2a564..3d0e744 100644
--- a/lib/wsfsp/operation/getattr_intern.h
+++ b/lib/wsfs/provider/operation/getattr_intern.h
@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_GETATTR_INTERN_H
 #define WSFSP_OPERATION_GETATTR_INTERN_H
 
-#include "wsfsp/operation/getattr.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/getattr.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfsp/operation/lookup.c b/lib/wsfs/provider/operation/lookup.c
similarity index 85%
rename from lib/wsfsp/operation/lookup.c
rename to lib/wsfs/provider/operation/lookup.c
index 29cf201..34e89c9 100644
--- a/lib/wsfsp/operation/lookup.c
+++ b/lib/wsfs/provider/operation/lookup.c
@@ -1,6 +1,6 @@
-#include "wsfsp/operation/lookup_intern.h"
+#include "wsfs/provider/operation/lookup_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_lookup(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfsp/operation/lookup_intern.h b/lib/wsfs/provider/operation/lookup_intern.h
similarity index 80%
rename from lib/wsfsp/operation/lookup_intern.h
rename to lib/wsfs/provider/operation/lookup_intern.h
index bf0aa53..65daf85 100644
--- a/lib/wsfsp/operation/lookup_intern.h
+++ b/lib/wsfs/provider/operation/lookup_intern.h
@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_LOOKUP_INTERN_H
 #define WSFSP_OPERATION_LOOKUP_INTERN_H
 
-#include "wsfsp/operation/lookup.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/lookup.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfsp/operation/open.c b/lib/wsfs/provider/operation/open.c
similarity index 86%
rename from lib/wsfsp/operation/open.c
rename to lib/wsfs/provider/operation/open.c
index 15a35fa..f599718 100644
--- a/lib/wsfsp/operation/open.c
+++ b/lib/wsfs/provider/operation/open.c
@@ -1,6 +1,6 @@
-#include "wsfsp/operation/open_intern.h"
+#include "wsfs/provider/operation/open_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_open(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfsp/operation/open_intern.h b/lib/wsfs/provider/operation/open_intern.h
similarity index 80%
rename from lib/wsfsp/operation/open_intern.h
rename to lib/wsfs/provider/operation/open_intern.h
index 006a407..496c9e1 100644
--- a/lib/wsfsp/operation/open_intern.h
+++ b/lib/wsfs/provider/operation/open_intern.h
@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_OPEN_INTERN_H
 #define WSFSP_OPERATION_OPEN_INTERN_H
 
-#include "wsfsp/operation/open.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/open.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfsp/operation/read.c b/lib/wsfs/provider/operation/read.c
similarity index 87%
rename from lib/wsfsp/operation/read.c
rename to lib/wsfs/provider/operation/read.c
index 48cb78e..40f2eda 100644
--- a/lib/wsfsp/operation/read.c
+++ b/lib/wsfs/provider/operation/read.c
@@ -1,6 +1,6 @@
-#include "wsfsp/operation/read_intern.h"
+#include "wsfs/provider/operation/read_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_read(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfsp/operation/read_intern.h b/lib/wsfs/provider/operation/read_intern.h
similarity index 82%
rename from lib/wsfsp/operation/read_intern.h
rename to lib/wsfs/provider/operation/read_intern.h
index 2891e5d..78d040e 100644
--- a/lib/wsfsp/operation/read_intern.h
+++ b/lib/wsfs/provider/operation/read_intern.h
@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_READ_INTERN_H
 #define WSFSP_OPERATION_READ_INTERN_H
 
-#include "wsfsp/operation/read.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/read.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfsp/operation/readdir.c b/lib/wsfs/provider/operation/readdir.c
similarity index 85%
rename from lib/wsfsp/operation/readdir.c
rename to lib/wsfs/provider/operation/readdir.c
index 212525b..979ac09 100644
--- a/lib/wsfsp/operation/readdir.c
+++ b/lib/wsfs/provider/operation/readdir.c
@@ -1,6 +1,6 @@
-#include "wsfsp/operation/readdir_intern.h"
+#include "wsfs/provider/operation/readdir_intern.h"
 #include <stdio.h>
-#include "wsfsp/operation/error.h"
+#include "wsfs/provider/operation/error.h"
 
 void wsfsp_readdir(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfsp/operation/readdir_intern.h b/lib/wsfs/provider/operation/readdir_intern.h
similarity index 80%
rename from lib/wsfsp/operation/readdir_intern.h
rename to lib/wsfs/provider/operation/readdir_intern.h
index d04a8ed..02b5cc3 100644
--- a/lib/wsfsp/operation/readdir_intern.h
+++ b/lib/wsfs/provider/operation/readdir_intern.h
@@ -1,8 +1,8 @@
 #ifndef WSFSP_OPERATION_READDIR_INTERN_H
 #define WSFSP_OPERATION_READDIR_INTERN_H
 
-#include "wsfsp/operation/readdir.h"
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/operation/readdir.h"
+#include "wsfs/provider/provider_intern.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfsp/provider.c b/lib/wsfs/provider/provider.c
similarity index 84%
rename from lib/wsfsp/provider.c
rename to lib/wsfs/provider/provider.c
index fd2412d..f64dabd 100644
--- a/lib/wsfsp/provider.c
+++ b/lib/wsfs/provider/provider.c
@@ -1,15 +1,15 @@
-#include "wsfsp/provider_intern.h"
+#include "wsfs/provider/provider_intern.h"
 
 #include <stdbool.h>
 #include <string.h>
 
-#include "wsfsp/request.h"
-#include "wsfsp/operation/lookup_intern.h"
-#include "wsfsp/operation/getattr_intern.h"
-#include "wsfsp/operation/readdir_intern.h"
-#include "wsfsp/operation/open_intern.h"
-#include "wsfsp/operation/close_intern.h"
-#include "wsfsp/operation/read_intern.h"
+#include "wsfs/provider/request.h"
+#include "wsfs/provider/operation/lookup_intern.h"
+#include "wsfs/provider/operation/getattr_intern.h"
+#include "wsfs/provider/operation/readdir_intern.h"
+#include "wsfs/provider/operation/open_intern.h"
+#include "wsfs/provider/operation/close_intern.h"
+#include "wsfs/provider/operation/read_intern.h"
 
 typedef void wsfsp_invoke_fn(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfsp/provider_intern.h b/lib/wsfs/provider/provider_intern.h
similarity index 88%
rename from lib/wsfsp/provider_intern.h
rename to lib/wsfs/provider/provider_intern.h
index 9f61a5f..9fd9709 100644
--- a/lib/wsfsp/provider_intern.h
+++ b/lib/wsfs/provider/provider_intern.h
@@ -1,8 +1,8 @@
 #ifndef WSFSP_PROVIDER_INTERN_H
 #define WSFSP_PROVIDER_INTERN_H
 
-#include "wsfsp/provider.h"
-#include "wsfsp/request.h"
+#include "wsfs/provider/provider.h"
+#include "wsfs/provider/request.h"
 
 #include <jansson.h>
 
diff --git a/lib/wsfsp/request.c b/lib/wsfs/provider/request.c
similarity index 92%
rename from lib/wsfsp/request.c
rename to lib/wsfs/provider/request.c
index fe1ac71..4774615 100644
--- a/lib/wsfsp/request.c
+++ b/lib/wsfs/provider/request.c
@@ -1,4 +1,4 @@
-#include "wsfsp/request.h"
+#include "wsfs/provider/request.h"
 
 #include <stdlib.h>
 
diff --git a/lib/wsfsp/request.h b/lib/wsfs/provider/request.h
similarity index 93%
rename from lib/wsfsp/request.h
rename to lib/wsfs/provider/request.h
index 49142d4..85e1cd3 100644
--- a/lib/wsfsp/request.h
+++ b/lib/wsfs/provider/request.h
@@ -2,7 +2,7 @@
 #define WSFSP_REQUEST_H
 
 #include <jansson.h>
-#include "wsfsp/provider.h"
+#include "wsfs/provider/provider.h"
 
 typedef void wsfsp_request_respond_fn(
     json_t * response,
diff --git a/lib/wsfsp/url.c b/lib/wsfs/provider/url.c
similarity index 98%
rename from lib/wsfsp/url.c
rename to lib/wsfs/provider/url.c
index 6fa3c9c..b250646 100644
--- a/lib/wsfsp/url.c
+++ b/lib/wsfs/provider/url.c
@@ -1,4 +1,4 @@
-#include "wsfsp/url.h"
+#include "wsfs/provider/url.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/wsfsp/url.h b/lib/wsfs/provider/url.h
similarity index 100%
rename from lib/wsfsp/url.h
rename to lib/wsfs/provider/url.h
diff --git a/test/test_fuse_req.cc b/test/test_fuse_req.cc
index 3ca9c1c..c01a6fc 100644
--- a/test/test_fuse_req.cc
+++ b/test/test_fuse_req.cc
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "wsfs/fuse_wrapper.h"
+#include "wsfs/adapter/fuse_wrapper.h"
 
 TEST(libfuse, fuse_req_t_size)
 {
diff --git a/test/test_response_parser.cc b/test/test_response_parser.cc
index 2d713b9..cf73c4e 100644
--- a/test/test_response_parser.cc
+++ b/test/test_response_parser.cc
@@ -1,7 +1,7 @@
 #include <string>
 #include <gtest/gtest.h>
 
-#include "wsfs/jsonrpc/response.h"
+#include "wsfs/adapter/jsonrpc/response.h"
 
 
 static void wsfs_response_parse_str(
diff --git a/test/test_server.cc b/test/test_server.cc
index 440dfa4..965852e 100644
--- a/test/test_server.cc
+++ b/test/test_server.cc
@@ -5,8 +5,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "wsfs/server.h"
-#include "wsfs/server_config.h"
+#include "wsfs/adapter/server.h"
+#include "wsfs/adapter/server_config.h"
 
 
 TEST(server, create_dispose)
diff --git a/test/test_timepoint.cc b/test/test_timepoint.cc
index 2eac48d..2a4dc19 100644
--- a/test/test_timepoint.cc
+++ b/test/test_timepoint.cc
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
 #include "msleep.hpp"
-#include "wsfs/time/timepoint.h"
+#include "wsfs/adapter/time/timepoint.h"
 
 using wsfs_test::msleep;
 
diff --git a/test/test_timer.cc b/test/test_timer.cc
index a05604b..8b3cac7 100644
--- a/test/test_timer.cc
+++ b/test/test_timer.cc
@@ -3,8 +3,8 @@
 #include <cstddef>
 
 #include "msleep.hpp"
-#include "wsfs/time/timer.h"
-#include "wsfs/time/timeout_manager.h"
+#include "wsfs/adapter/time/timer.h"
+#include "wsfs/adapter/time/timeout_manager.h"
 
 using std::size_t;
 using wsfs_test::msleep;
diff --git a/test/test_url.cc b/test/test_url.cc
index 935493e..243f86e 100644
--- a/test/test_url.cc
+++ b/test/test_url.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "wsfsp/url.h"
+#include "wsfs/provider/url.h"
 
 TEST(url, ParseWs)
 {