diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10eb4db..601cc5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,14 +45,12 @@ set(EXTRA_CFLAGS
 )
 
 
-install(FILES include/wsfs/status.h DESTINATION include/wsfs)
-
 # libwsfs-core
 
 add_library(wsfs-core STATIC 
-	lib/wsfs/message.c
-	lib/wsfs/message_queue.c
-	lib/wsfs/status.c
+	lib/wsfs/core/message.c
+	lib/wsfs/core/message_queue.c
+	lib/wsfs/core/status.c
 )
 
 set_target_properties(wsfs-core PROPERTIES OUTPUT_NAME wsfs-core)
@@ -60,6 +58,9 @@ target_include_directories(wsfs-core PUBLIC lib ${EXTRA_INCLUDE_DIRS})
 target_compile_options(wsfs-core PUBLIC ${EXTRA_CFLAGS})
 set_target_properties(wsfs-core PROPERTIES C_VISIBILITY_PRESET hidden)
 
+install(DIRECTORY include/wsfs/core DESTINATION include/wsfs)
+
+
 # libwsfs-adapter
 
 add_library(wsfs-adapter-static STATIC 
diff --git a/include/wsfs/status.h b/include/wsfs/core/status.h
similarity index 100%
rename from include/wsfs/status.h
rename to include/wsfs/core/status.h
diff --git a/include/wsfs/provider/operation/error.h b/include/wsfs/provider/operation/error.h
index be2dd19..4296816 100644
--- a/include/wsfs/provider/operation/error.h
+++ b/include/wsfs/provider/operation/error.h
@@ -2,7 +2,7 @@
 #define WSFSP_OPERATION_ERROR_H
 
 #include "wsfs/provider/api.h"
-#include "wsfs/status.h"
+#include "wsfs/core/status.h"
 
 struct wsfsp_request;
 
diff --git a/include/wsfs_adapter.h b/include/wsfs_adapter.h
index 6900f13..076267f 100644
--- a/include/wsfs_adapter.h
+++ b/include/wsfs_adapter.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_ADAPTER_H
 #define WSFS_ADAPTER_H
 
-#include <wsfs/status.h>
+#include <wsfs/core/status.h>
 
 #include <wsfs/adapter/api.h>
 #include <wsfs/adapter/server.h>
diff --git a/include/wsfs_provider.h b/include/wsfs_provider.h
index 63e09fc..1251212 100644
--- a/include/wsfs_provider.h
+++ b/include/wsfs_provider.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_PROVIDER_H
 #define WSFS_PROVIDER_H
 
-#include <wsfs/status.h>
+#include <wsfs/core/status.h>
 
 #include <wsfs/provider/api.h>
 #include <wsfs/provider/client.h>
diff --git a/lib/wsfs/adapter/impl/jsonrpc/method.h b/lib/wsfs/adapter/impl/jsonrpc/method.h
index 1c2f9e5..fe3db02 100644
--- a/lib/wsfs/adapter/impl/jsonrpc/method.h
+++ b/lib/wsfs/adapter/impl/jsonrpc/method.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/core/status.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfs/adapter/impl/jsonrpc/response.h b/lib/wsfs/adapter/impl/jsonrpc/response.h
index 48e9c6e..65518dd 100644
--- a/lib/wsfs/adapter/impl/jsonrpc/response.h
+++ b/lib/wsfs/adapter/impl/jsonrpc/response.h
@@ -9,7 +9,7 @@ using std::size_t;
 #endif
 
 #include <jansson.h>
-#include "wsfs/status.h"
+#include "wsfs/core/status.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/wsfs/adapter/impl/operation/close.c b/lib/wsfs/adapter/impl/operation/close.c
index fbdb762..b50bbcd 100644
--- a/lib/wsfs/adapter/impl/operation/close.c
+++ b/lib/wsfs/adapter/impl/operation/close.c
@@ -5,7 +5,7 @@
 #include <jansson.h>
 
 #include "wsfs/adapter/impl/jsonrpc/server.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 void wsfs_impl_operation_close(
 	fuse_req_t request,
diff --git a/lib/wsfs/adapter/impl/operation/getattr.c b/lib/wsfs/adapter/impl/operation/getattr.c
index bd626d3..a8c6b47 100644
--- a/lib/wsfs/adapter/impl/operation/getattr.c
+++ b/lib/wsfs/adapter/impl/operation/getattr.c
@@ -9,7 +9,7 @@
 
 #include "wsfs/adapter/impl/jsonrpc/server.h"
 #include "wsfs/adapter/impl/jsonrpc/util.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 struct wsfs_impl_operation_getattr_context
 {
diff --git a/lib/wsfs/adapter/impl/operation/lookup.c b/lib/wsfs/adapter/impl/operation/lookup.c
index 8feaed5..c1e06d9 100644
--- a/lib/wsfs/adapter/impl/operation/lookup.c
+++ b/lib/wsfs/adapter/impl/operation/lookup.c
@@ -12,7 +12,7 @@
 
 #include "wsfs/adapter/impl/jsonrpc/server.h"
 #include "wsfs/adapter/impl/jsonrpc/util.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 struct wsfs_impl_operation_lookup_context
 {
diff --git a/lib/wsfs/adapter/impl/operation/open.c b/lib/wsfs/adapter/impl/operation/open.c
index 8ffbcdf..63c8e91 100644
--- a/lib/wsfs/adapter/impl/operation/open.c
+++ b/lib/wsfs/adapter/impl/operation/open.c
@@ -5,8 +5,8 @@
 #include <jansson.h>
 
 #include "wsfs/adapter/impl/jsonrpc/server.h"
-#include "wsfs/util.h"
-#include "wsfs/status.h"
+#include "wsfs/core/util.h"
+#include "wsfs/core/status.h"
 
 static void wsfs_impl_operation_open_finished(
 	void * user_data,
diff --git a/lib/wsfs/adapter/impl/operation/readdir.c b/lib/wsfs/adapter/impl/operation/readdir.c
index 0d3af0a..16c6640 100644
--- a/lib/wsfs/adapter/impl/operation/readdir.c
+++ b/lib/wsfs/adapter/impl/operation/readdir.c
@@ -9,7 +9,7 @@
 #include <unistd.h> 
 
 #include "wsfs/adapter/impl/jsonrpc/server.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 
 #define WSFS_DIRBUFFER_INITIAL_SIZE 1024
diff --git a/lib/wsfs/adapter/impl/server_protocol.c b/lib/wsfs/adapter/impl/server_protocol.c
index 2dc281d..60e69a6 100644
--- a/lib/wsfs/adapter/impl/server_protocol.c
+++ b/lib/wsfs/adapter/impl/server_protocol.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <libwebsockets.h>
 
-#include "wsfs/message.h"
-#include "wsfs/util.h"
+#include "wsfs/core/message.h"
+#include "wsfs/core/util.h"
 
 #include "wsfs/adapter/impl/filesystem.h"
 
diff --git a/lib/wsfs/adapter/impl/session.c b/lib/wsfs/adapter/impl/session.c
index bfa9b1b..436b039 100644
--- a/lib/wsfs/adapter/impl/session.c
+++ b/lib/wsfs/adapter/impl/session.c
@@ -1,7 +1,7 @@
 #include "wsfs/adapter/impl/session.h"
 #include "wsfs/adapter/impl/authenticators.h"
-#include "wsfs/message_queue.h"
-#include "wsfs/message.h"
+#include "wsfs/core/message_queue.h"
+#include "wsfs/core/message.h"
 #include "wsfs/adapter/impl/jsonrpc/server.h"
 
 #include <libwebsockets.h>
diff --git a/lib/wsfs/adapter/impl/session.h b/lib/wsfs/adapter/impl/session.h
index 4b08ca0..ae24d97 100644
--- a/lib/wsfs/adapter/impl/session.h
+++ b/lib/wsfs/adapter/impl/session.h
@@ -9,7 +9,7 @@
 using std::size_t;
 #endif
 
-#include "wsfs/message_queue.h"
+#include "wsfs/core/message_queue.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/lib/wsfs/message.c b/lib/wsfs/core/message.c
similarity index 96%
rename from lib/wsfs/message.c
rename to lib/wsfs/core/message.c
index 73a756d..4c6c790 100644
--- a/lib/wsfs/message.c
+++ b/lib/wsfs/core/message.c
@@ -1,4 +1,4 @@
-#include "wsfs/message.h"
+#include "wsfs/core/message.h"
 
 #include <stdlib.h>
 #include <libwebsockets.h>
diff --git a/lib/wsfs/message.h b/lib/wsfs/core/message.h
similarity index 100%
rename from lib/wsfs/message.h
rename to lib/wsfs/core/message.h
diff --git a/lib/wsfs/message_queue.c b/lib/wsfs/core/message_queue.c
similarity index 94%
rename from lib/wsfs/message_queue.c
rename to lib/wsfs/core/message_queue.c
index 08b7e5e..e758c67 100644
--- a/lib/wsfs/message_queue.c
+++ b/lib/wsfs/core/message_queue.c
@@ -1,5 +1,5 @@
-#include "wsfs/message_queue.h"
-#include "wsfs/message.h"
+#include "wsfs/core/message_queue.h"
+#include "wsfs/core/message.h"
 
 void wsfs_message_queue_init(
     struct wsfs_message_queue * queue)
diff --git a/lib/wsfs/message_queue.h b/lib/wsfs/core/message_queue.h
similarity index 100%
rename from lib/wsfs/message_queue.h
rename to lib/wsfs/core/message_queue.h
diff --git a/lib/wsfs/status.c b/lib/wsfs/core/status.c
similarity index 95%
rename from lib/wsfs/status.c
rename to lib/wsfs/core/status.c
index f2db1b2..f2576f7 100644
--- a/lib/wsfs/status.c
+++ b/lib/wsfs/core/status.c
@@ -1,4 +1,4 @@
-#include "wsfs/status_intern.h"
+#include "wsfs/core/status_intern.h"
 
 #include <errno.h>
 
diff --git a/lib/wsfs/status_intern.h b/lib/wsfs/core/status_intern.h
similarity index 89%
rename from lib/wsfs/status_intern.h
rename to lib/wsfs/core/status_intern.h
index a5f1880..08f4b04 100644
--- a/lib/wsfs/status_intern.h
+++ b/lib/wsfs/core/status_intern.h
@@ -1,7 +1,7 @@
 #ifndef WSFS_STATUS_INTERN_H
 #define WSFS_STATUS_INTERN_H
 
-#include "wsfs/status.h"
+#include "wsfs/core/status.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/wsfs/util.h b/lib/wsfs/core/util.h
similarity index 100%
rename from lib/wsfs/util.h
rename to lib/wsfs/core/util.h
diff --git a/lib/wsfs/provider/client_protocol.c b/lib/wsfs/provider/client_protocol.c
index f3c026e..a7bc900 100644
--- a/lib/wsfs/provider/client_protocol.c
+++ b/lib/wsfs/provider/client_protocol.c
@@ -8,8 +8,8 @@
 
 
 #include "wsfs/provider/provider.h"
-#include "wsfs/util.h"
-#include "wsfs/message.h"
+#include "wsfs/core/util.h"
+#include "wsfs/core/message.h"
 
 static void wsfsp_client_protocol_respond(
     json_t * response,
diff --git a/lib/wsfs/provider/client_protocol_intern.h b/lib/wsfs/provider/client_protocol_intern.h
index b452df0..4cbef5b 100644
--- a/lib/wsfs/provider/client_protocol_intern.h
+++ b/lib/wsfs/provider/client_protocol_intern.h
@@ -5,7 +5,7 @@
 #include "wsfs/provider/provider.h"
 #include "wsfs/provider/request.h"
 
-#include "wsfs/message_queue.h"
+#include "wsfs/core/message_queue.h"
 
 struct wsfsp_client_protocol
 {
diff --git a/lib/wsfs/provider/operation/close.c b/lib/wsfs/provider/operation/close.c
index 4ef6837..ebd6c9a 100644
--- a/lib/wsfs/provider/operation/close.c
+++ b/lib/wsfs/provider/operation/close.c
@@ -1,6 +1,6 @@
 #include "wsfs/provider/operation/close_intern.h"
 #include <limits.h>
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 void wsfsp_close(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfs/provider/operation/getattr.c b/lib/wsfs/provider/operation/getattr.c
index 90aefa0..242e107 100644
--- a/lib/wsfs/provider/operation/getattr.c
+++ b/lib/wsfs/provider/operation/getattr.c
@@ -4,7 +4,7 @@
 
 #include "wsfs/provider/operation/error.h"
 #include "wsfs/provider/request.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 
 void wsfsp_getattr(
diff --git a/lib/wsfs/provider/operation/lookup.c b/lib/wsfs/provider/operation/lookup.c
index 900b901..4fe3644 100644
--- a/lib/wsfs/provider/operation/lookup.c
+++ b/lib/wsfs/provider/operation/lookup.c
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 
 #include "wsfs/provider/operation/error.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 void wsfsp_lookup(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfs/provider/operation/open.c b/lib/wsfs/provider/operation/open.c
index 9196ded..88e86ca 100644
--- a/lib/wsfs/provider/operation/open.c
+++ b/lib/wsfs/provider/operation/open.c
@@ -1,7 +1,7 @@
 #include "wsfs/provider/operation/open_intern.h"
 #include "wsfs/provider/operation/error.h"
 #include "wsfs/provider/request.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 void wsfsp_open(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfs/provider/operation/read.c b/lib/wsfs/provider/operation/read.c
index ff03702..b1d9229 100644
--- a/lib/wsfs/provider/operation/read.c
+++ b/lib/wsfs/provider/operation/read.c
@@ -4,7 +4,7 @@
 #include <libwebsockets.h>
 
 #include "wsfs/provider/operation/error.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 void wsfsp_read(
     struct wsfsp_invokation_context * context,
diff --git a/lib/wsfs/provider/operation/readdir.c b/lib/wsfs/provider/operation/readdir.c
index f94c0f3..99a1ff6 100644
--- a/lib/wsfs/provider/operation/readdir.c
+++ b/lib/wsfs/provider/operation/readdir.c
@@ -2,7 +2,7 @@
 #include "wsfs/provider/operation/error.h"
 #include "wsfs/provider/dirbuffer_intern.h"
 #include "wsfs/provider/request.h"
-#include "wsfs/util.h"
+#include "wsfs/core/util.h"
 
 void wsfsp_readdir(
     struct wsfsp_invokation_context * context,