diff --git a/cmake/jsonrpc.cmake b/cmake/jsonrpc.cmake
index fb417bb..76653bb 100644
--- a/cmake/jsonrpc.cmake
+++ b/cmake/jsonrpc.cmake
@@ -1,14 +1,19 @@
 # jsonrpc
 
 add_library(jsonrpc STATIC
-	lib/jsonrpc/api.c
-	lib/jsonrpc/impl/proxy.c
-	lib/jsonrpc/impl/server.c
-	lib/jsonrpc/impl/method.c
-	lib/jsonrpc/impl/request.c
-	lib/jsonrpc/impl/response.c
-	lib/jsonrpc/impl/error.c
+	lib/jsonrpc/src/jsonrpc/api.c
+	lib/jsonrpc/src/jsonrpc/impl/proxy.c
+	lib/jsonrpc/src/jsonrpc/impl/server.c
+	lib/jsonrpc/src/jsonrpc/impl/method.c
+	lib/jsonrpc/src/jsonrpc/impl/request.c
+	lib/jsonrpc/src/jsonrpc/impl/response.c
+	lib/jsonrpc/src/jsonrpc/impl/error.c
+)
+
+target_include_directories(jsonrpc PUBLIC 
+	lib/jsonrpc/include
+	lib/jsonrpc/src
+	lib
 )
 
-target_include_directories(jsonrpc PUBLIC lib)
 set_target_properties(jsonrpc PROPERTIES C_VISIBILITY_PRESET hidden)
diff --git a/cmake/unit_tests.cmake b/cmake/unit_tests.cmake
index 37ef85f..a6fbc8e 100644
--- a/cmake/unit_tests.cmake
+++ b/cmake/unit_tests.cmake
@@ -7,14 +7,14 @@ include(GoogleTest)
 pkg_check_modules(GMOCK gmock)
 
 add_executable(alltests
-	test/jsonrpc/test_util.cc
-	test/jsonrpc/test_is_request.cc
-	test/jsonrpc/test_request.cc
-	test/jsonrpc/test_is_response.cc
-	test/jsonrpc/test_response.cc
-	test/jsonrpc/test_server.cc
-	test/jsonrpc/test_proxy.cc
-	test/jsonrpc/test_response_parser.cc
+	lib/jsonrpc/test/jsonrpc/test_util.cc
+	lib/jsonrpc/test/jsonrpc/test_is_request.cc
+	lib/jsonrpc/test/jsonrpc/test_request.cc
+	lib/jsonrpc/test/jsonrpc/test_is_response.cc
+	lib/jsonrpc/test/jsonrpc/test_response.cc
+	lib/jsonrpc/test/jsonrpc/test_server.cc
+	lib/jsonrpc/test/jsonrpc/test_proxy.cc
+	lib/jsonrpc/test/jsonrpc/test_response_parser.cc
 	test/webfuse/utils/tempdir.cc
 	test/webfuse/utils/file_utils.cc
 	test/webfuse/utils/msleep.cc
@@ -52,6 +52,7 @@ add_executable(alltests
 )
 
 target_include_directories(alltests PRIVATE
+	lib/jsonrpc/include
 	${FUSE3_INCLUDE_DIRS} 
 	${UUID_INCLUDE_DIRS}
 )
diff --git a/cmake/webfuse_adapter.cmake b/cmake/webfuse_adapter.cmake
index 719f699..7362802 100644
--- a/cmake/webfuse_adapter.cmake
+++ b/cmake/webfuse_adapter.cmake
@@ -32,6 +32,7 @@ add_library(webfuse-adapter-static STATIC
 
 target_include_directories(webfuse-adapter-static PRIVATE
 	lib
+	lib/jsonrpc/include
 	${FUSE3_INCLUDE_DIRS} 
 	${UUID_INCLUDE_DIRS}
 )
diff --git a/cmake/webfuse_core.cmake b/cmake/webfuse_core.cmake
index 2926384..8db1dad 100644
--- a/cmake/webfuse_core.cmake
+++ b/cmake/webfuse_core.cmake
@@ -12,7 +12,7 @@ add_library(webfuse-core STATIC
 )
 
 set_target_properties(webfuse-core PROPERTIES OUTPUT_NAME webfuse-core)
-target_include_directories(webfuse-core PUBLIC lib)
+target_include_directories(webfuse-core PUBLIC lib lib/jsonrpc/include)
 set_target_properties(webfuse-core PROPERTIES C_VISIBILITY_PRESET hidden)
 
 install(DIRECTORY include/webfuse/core DESTINATION include/webfuse COMPONENT headers)
diff --git a/include/jsonrpc.h b/lib/jsonrpc/include/jsonrpc.h
similarity index 100%
rename from include/jsonrpc.h
rename to lib/jsonrpc/include/jsonrpc.h
diff --git a/include/jsonrpc/api.h b/lib/jsonrpc/include/jsonrpc/api.h
similarity index 100%
rename from include/jsonrpc/api.h
rename to lib/jsonrpc/include/jsonrpc/api.h
diff --git a/include/jsonrpc/method_invoke_fn.h b/lib/jsonrpc/include/jsonrpc/method_invoke_fn.h
similarity index 100%
rename from include/jsonrpc/method_invoke_fn.h
rename to lib/jsonrpc/include/jsonrpc/method_invoke_fn.h
diff --git a/include/jsonrpc/proxy.h b/lib/jsonrpc/include/jsonrpc/proxy.h
similarity index 100%
rename from include/jsonrpc/proxy.h
rename to lib/jsonrpc/include/jsonrpc/proxy.h
diff --git a/include/jsonrpc/proxy_finished_fn.h b/lib/jsonrpc/include/jsonrpc/proxy_finished_fn.h
similarity index 100%
rename from include/jsonrpc/proxy_finished_fn.h
rename to lib/jsonrpc/include/jsonrpc/proxy_finished_fn.h
diff --git a/include/jsonrpc/request.h b/lib/jsonrpc/include/jsonrpc/request.h
similarity index 100%
rename from include/jsonrpc/request.h
rename to lib/jsonrpc/include/jsonrpc/request.h
diff --git a/include/jsonrpc/response.h b/lib/jsonrpc/include/jsonrpc/response.h
similarity index 100%
rename from include/jsonrpc/response.h
rename to lib/jsonrpc/include/jsonrpc/response.h
diff --git a/include/jsonrpc/send_fn.h b/lib/jsonrpc/include/jsonrpc/send_fn.h
similarity index 100%
rename from include/jsonrpc/send_fn.h
rename to lib/jsonrpc/include/jsonrpc/send_fn.h
diff --git a/include/jsonrpc/server.h b/lib/jsonrpc/include/jsonrpc/server.h
similarity index 100%
rename from include/jsonrpc/server.h
rename to lib/jsonrpc/include/jsonrpc/server.h
diff --git a/include/jsonrpc/status.h b/lib/jsonrpc/include/jsonrpc/status.h
similarity index 100%
rename from include/jsonrpc/status.h
rename to lib/jsonrpc/include/jsonrpc/status.h
diff --git a/lib/jsonrpc/api.c b/lib/jsonrpc/src/jsonrpc/api.c
similarity index 100%
rename from lib/jsonrpc/api.c
rename to lib/jsonrpc/src/jsonrpc/api.c
diff --git a/lib/jsonrpc/impl/error.c b/lib/jsonrpc/src/jsonrpc/impl/error.c
similarity index 100%
rename from lib/jsonrpc/impl/error.c
rename to lib/jsonrpc/src/jsonrpc/impl/error.c
diff --git a/lib/jsonrpc/impl/error.h b/lib/jsonrpc/src/jsonrpc/impl/error.h
similarity index 100%
rename from lib/jsonrpc/impl/error.h
rename to lib/jsonrpc/src/jsonrpc/impl/error.h
diff --git a/lib/jsonrpc/impl/method.c b/lib/jsonrpc/src/jsonrpc/impl/method.c
similarity index 100%
rename from lib/jsonrpc/impl/method.c
rename to lib/jsonrpc/src/jsonrpc/impl/method.c
diff --git a/lib/jsonrpc/impl/method.h b/lib/jsonrpc/src/jsonrpc/impl/method.h
similarity index 100%
rename from lib/jsonrpc/impl/method.h
rename to lib/jsonrpc/src/jsonrpc/impl/method.h
diff --git a/lib/jsonrpc/impl/proxy.c b/lib/jsonrpc/src/jsonrpc/impl/proxy.c
similarity index 100%
rename from lib/jsonrpc/impl/proxy.c
rename to lib/jsonrpc/src/jsonrpc/impl/proxy.c
diff --git a/lib/jsonrpc/impl/proxy.h b/lib/jsonrpc/src/jsonrpc/impl/proxy.h
similarity index 100%
rename from lib/jsonrpc/impl/proxy.h
rename to lib/jsonrpc/src/jsonrpc/impl/proxy.h
diff --git a/lib/jsonrpc/impl/request.c b/lib/jsonrpc/src/jsonrpc/impl/request.c
similarity index 100%
rename from lib/jsonrpc/impl/request.c
rename to lib/jsonrpc/src/jsonrpc/impl/request.c
diff --git a/lib/jsonrpc/impl/request.h b/lib/jsonrpc/src/jsonrpc/impl/request.h
similarity index 100%
rename from lib/jsonrpc/impl/request.h
rename to lib/jsonrpc/src/jsonrpc/impl/request.h
diff --git a/lib/jsonrpc/impl/response.c b/lib/jsonrpc/src/jsonrpc/impl/response.c
similarity index 100%
rename from lib/jsonrpc/impl/response.c
rename to lib/jsonrpc/src/jsonrpc/impl/response.c
diff --git a/lib/jsonrpc/impl/response.h b/lib/jsonrpc/src/jsonrpc/impl/response.h
similarity index 100%
rename from lib/jsonrpc/impl/response.h
rename to lib/jsonrpc/src/jsonrpc/impl/response.h
diff --git a/lib/jsonrpc/impl/server.c b/lib/jsonrpc/src/jsonrpc/impl/server.c
similarity index 100%
rename from lib/jsonrpc/impl/server.c
rename to lib/jsonrpc/src/jsonrpc/impl/server.c
diff --git a/lib/jsonrpc/impl/server.h b/lib/jsonrpc/src/jsonrpc/impl/server.h
similarity index 100%
rename from lib/jsonrpc/impl/server.h
rename to lib/jsonrpc/src/jsonrpc/impl/server.h
diff --git a/lib/jsonrpc/impl/unused_param.h b/lib/jsonrpc/src/jsonrpc/impl/unused_param.h
similarity index 100%
rename from lib/jsonrpc/impl/unused_param.h
rename to lib/jsonrpc/src/jsonrpc/impl/unused_param.h
diff --git a/test/jsonrpc/test_is_request.cc b/lib/jsonrpc/test/jsonrpc/test_is_request.cc
similarity index 100%
rename from test/jsonrpc/test_is_request.cc
rename to lib/jsonrpc/test/jsonrpc/test_is_request.cc
diff --git a/test/jsonrpc/test_is_response.cc b/lib/jsonrpc/test/jsonrpc/test_is_response.cc
similarity index 100%
rename from test/jsonrpc/test_is_response.cc
rename to lib/jsonrpc/test/jsonrpc/test_is_response.cc
diff --git a/test/jsonrpc/test_proxy.cc b/lib/jsonrpc/test/jsonrpc/test_proxy.cc
similarity index 100%
rename from test/jsonrpc/test_proxy.cc
rename to lib/jsonrpc/test/jsonrpc/test_proxy.cc
diff --git a/test/jsonrpc/test_request.cc b/lib/jsonrpc/test/jsonrpc/test_request.cc
similarity index 100%
rename from test/jsonrpc/test_request.cc
rename to lib/jsonrpc/test/jsonrpc/test_request.cc
diff --git a/test/jsonrpc/test_response.cc b/lib/jsonrpc/test/jsonrpc/test_response.cc
similarity index 100%
rename from test/jsonrpc/test_response.cc
rename to lib/jsonrpc/test/jsonrpc/test_response.cc
diff --git a/test/jsonrpc/test_response_parser.cc b/lib/jsonrpc/test/jsonrpc/test_response_parser.cc
similarity index 100%
rename from test/jsonrpc/test_response_parser.cc
rename to lib/jsonrpc/test/jsonrpc/test_response_parser.cc
diff --git a/test/jsonrpc/test_server.cc b/lib/jsonrpc/test/jsonrpc/test_server.cc
similarity index 100%
rename from test/jsonrpc/test_server.cc
rename to lib/jsonrpc/test/jsonrpc/test_server.cc
diff --git a/test/jsonrpc/test_util.cc b/lib/jsonrpc/test/jsonrpc/test_util.cc
similarity index 100%
rename from test/jsonrpc/test_util.cc
rename to lib/jsonrpc/test/jsonrpc/test_util.cc