diff --git a/.gitmodules b/.gitmodules
index 9b655d9cc..d0178eb91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "python/pybind11"]
-	path = python/pybind11
+	path = libs/pybind11
 	url = https://github.com/pybind/pybind11.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9c394baa..442156c0c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,9 +109,14 @@ if(SLS_USE_SANITIZER)
     # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
+#rapidjson
+add_library(rapidjson INTERFACE)
+target_include_directories(rapidjson INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libs/rapidjson>  
+)
 
 # Install fake the libraries
-install(TARGETS slsProjectOptions slsProjectWarnings
+install(TARGETS slsProjectOptions slsProjectWarnings rapidjson
     EXPORT "${TARGETS_EXPORT_NAME}"
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -132,6 +137,9 @@ if (SLS_USE_TESTS)
     add_subdirectory(tests)
 endif(SLS_USE_TESTS)
 
+
+
+
 # Common functionallity to detector and receiver
 add_subdirectory(slsSupportLib)
 
@@ -165,6 +173,7 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
+    add_subdirectory(libs/pybind11)
     add_subdirectory(python)
 endif(SLS_USE_PYTHON)
 
diff --git a/catch/catch.hpp b/libs/catch/catch.hpp
similarity index 100%
rename from catch/catch.hpp
rename to libs/catch/catch.hpp
diff --git a/catch/clara.hpp b/libs/catch/clara.hpp
similarity index 100%
rename from catch/clara.hpp
rename to libs/catch/clara.hpp
diff --git a/python/pybind11 b/libs/pybind11
similarity index 100%
rename from python/pybind11
rename to libs/pybind11
diff --git a/slsSupportLib/include/rapidjson/allocators.h b/libs/rapidjson/rapidjson/allocators.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/allocators.h
rename to libs/rapidjson/rapidjson/allocators.h
diff --git a/slsSupportLib/include/rapidjson/document.h b/libs/rapidjson/rapidjson/document.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/document.h
rename to libs/rapidjson/rapidjson/document.h
diff --git a/slsSupportLib/include/rapidjson/encodedstream.h b/libs/rapidjson/rapidjson/encodedstream.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/encodedstream.h
rename to libs/rapidjson/rapidjson/encodedstream.h
diff --git a/slsSupportLib/include/rapidjson/encodings.h b/libs/rapidjson/rapidjson/encodings.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/encodings.h
rename to libs/rapidjson/rapidjson/encodings.h
diff --git a/slsSupportLib/include/rapidjson/error/en.h b/libs/rapidjson/rapidjson/error/en.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/error/en.h
rename to libs/rapidjson/rapidjson/error/en.h
diff --git a/slsSupportLib/include/rapidjson/error/error.h b/libs/rapidjson/rapidjson/error/error.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/error/error.h
rename to libs/rapidjson/rapidjson/error/error.h
diff --git a/slsSupportLib/include/rapidjson/filereadstream.h b/libs/rapidjson/rapidjson/filereadstream.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/filereadstream.h
rename to libs/rapidjson/rapidjson/filereadstream.h
diff --git a/slsSupportLib/include/rapidjson/filewritestream.h b/libs/rapidjson/rapidjson/filewritestream.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/filewritestream.h
rename to libs/rapidjson/rapidjson/filewritestream.h
diff --git a/slsSupportLib/include/rapidjson/fwd.h b/libs/rapidjson/rapidjson/fwd.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/fwd.h
rename to libs/rapidjson/rapidjson/fwd.h
diff --git a/slsSupportLib/include/rapidjson/internal/biginteger.h b/libs/rapidjson/rapidjson/internal/biginteger.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/biginteger.h
rename to libs/rapidjson/rapidjson/internal/biginteger.h
diff --git a/slsSupportLib/include/rapidjson/internal/diyfp.h b/libs/rapidjson/rapidjson/internal/diyfp.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/diyfp.h
rename to libs/rapidjson/rapidjson/internal/diyfp.h
diff --git a/slsSupportLib/include/rapidjson/internal/dtoa.h b/libs/rapidjson/rapidjson/internal/dtoa.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/dtoa.h
rename to libs/rapidjson/rapidjson/internal/dtoa.h
diff --git a/slsSupportLib/include/rapidjson/internal/ieee754.h b/libs/rapidjson/rapidjson/internal/ieee754.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/ieee754.h
rename to libs/rapidjson/rapidjson/internal/ieee754.h
diff --git a/slsSupportLib/include/rapidjson/internal/itoa.h b/libs/rapidjson/rapidjson/internal/itoa.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/itoa.h
rename to libs/rapidjson/rapidjson/internal/itoa.h
diff --git a/slsSupportLib/include/rapidjson/internal/meta.h b/libs/rapidjson/rapidjson/internal/meta.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/meta.h
rename to libs/rapidjson/rapidjson/internal/meta.h
diff --git a/slsSupportLib/include/rapidjson/internal/pow10.h b/libs/rapidjson/rapidjson/internal/pow10.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/pow10.h
rename to libs/rapidjson/rapidjson/internal/pow10.h
diff --git a/slsSupportLib/include/rapidjson/internal/regex.h b/libs/rapidjson/rapidjson/internal/regex.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/regex.h
rename to libs/rapidjson/rapidjson/internal/regex.h
diff --git a/slsSupportLib/include/rapidjson/internal/stack.h b/libs/rapidjson/rapidjson/internal/stack.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/stack.h
rename to libs/rapidjson/rapidjson/internal/stack.h
diff --git a/slsSupportLib/include/rapidjson/internal/strfunc.h b/libs/rapidjson/rapidjson/internal/strfunc.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/strfunc.h
rename to libs/rapidjson/rapidjson/internal/strfunc.h
diff --git a/slsSupportLib/include/rapidjson/internal/strtod.h b/libs/rapidjson/rapidjson/internal/strtod.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/strtod.h
rename to libs/rapidjson/rapidjson/internal/strtod.h
diff --git a/slsSupportLib/include/rapidjson/internal/swap.h b/libs/rapidjson/rapidjson/internal/swap.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/internal/swap.h
rename to libs/rapidjson/rapidjson/internal/swap.h
diff --git a/slsSupportLib/include/rapidjson/istreamwrapper.h b/libs/rapidjson/rapidjson/istreamwrapper.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/istreamwrapper.h
rename to libs/rapidjson/rapidjson/istreamwrapper.h
diff --git a/slsSupportLib/include/rapidjson/memorybuffer.h b/libs/rapidjson/rapidjson/memorybuffer.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/memorybuffer.h
rename to libs/rapidjson/rapidjson/memorybuffer.h
diff --git a/slsSupportLib/include/rapidjson/memorystream.h b/libs/rapidjson/rapidjson/memorystream.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/memorystream.h
rename to libs/rapidjson/rapidjson/memorystream.h
diff --git a/slsSupportLib/include/rapidjson/msinttypes/inttypes.h b/libs/rapidjson/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/msinttypes/inttypes.h
rename to libs/rapidjson/rapidjson/msinttypes/inttypes.h
diff --git a/slsSupportLib/include/rapidjson/msinttypes/stdint.h b/libs/rapidjson/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/msinttypes/stdint.h
rename to libs/rapidjson/rapidjson/msinttypes/stdint.h
diff --git a/slsSupportLib/include/rapidjson/ostreamwrapper.h b/libs/rapidjson/rapidjson/ostreamwrapper.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/ostreamwrapper.h
rename to libs/rapidjson/rapidjson/ostreamwrapper.h
diff --git a/slsSupportLib/include/rapidjson/pointer.h b/libs/rapidjson/rapidjson/pointer.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/pointer.h
rename to libs/rapidjson/rapidjson/pointer.h
diff --git a/slsSupportLib/include/rapidjson/prettywriter.h b/libs/rapidjson/rapidjson/prettywriter.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/prettywriter.h
rename to libs/rapidjson/rapidjson/prettywriter.h
diff --git a/slsSupportLib/include/rapidjson/rapidjson.h b/libs/rapidjson/rapidjson/rapidjson.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/rapidjson.h
rename to libs/rapidjson/rapidjson/rapidjson.h
diff --git a/slsSupportLib/include/rapidjson/reader.h b/libs/rapidjson/rapidjson/reader.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/reader.h
rename to libs/rapidjson/rapidjson/reader.h
diff --git a/slsSupportLib/include/rapidjson/schema.h b/libs/rapidjson/rapidjson/schema.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/schema.h
rename to libs/rapidjson/rapidjson/schema.h
diff --git a/slsSupportLib/include/rapidjson/stream.h b/libs/rapidjson/rapidjson/stream.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/stream.h
rename to libs/rapidjson/rapidjson/stream.h
diff --git a/slsSupportLib/include/rapidjson/stringbuffer.h b/libs/rapidjson/rapidjson/stringbuffer.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/stringbuffer.h
rename to libs/rapidjson/rapidjson/stringbuffer.h
diff --git a/slsSupportLib/include/rapidjson/writer.h b/libs/rapidjson/rapidjson/writer.h
similarity index 100%
rename from slsSupportLib/include/rapidjson/writer.h
rename to libs/rapidjson/rapidjson/writer.h
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 16d4a95e3..12042c6b6 100755
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(pybind11)
+
 pybind11_add_module(_sls_detector src/main.cpp)
 
 
diff --git a/slsSupportLib/CMakeLists.txt b/slsSupportLib/CMakeLists.txt
index 108793b95..cf6b0a409 100755
--- a/slsSupportLib/CMakeLists.txt
+++ b/slsSupportLib/CMakeLists.txt
@@ -53,7 +53,10 @@ set_target_properties(slsSupportLib PROPERTIES
     PUBLIC_HEADER "${PUBLICHEADERS}"
 )
 
-target_link_libraries(slsSupportLib slsProjectOptions slsProjectWarnings)
+target_link_libraries(slsSupportLib 
+    slsProjectOptions 
+    slsProjectWarnings 
+    rapidjson)
 
 if (SLS_USE_TESTS)
     add_subdirectory(tests)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9fee959cf..a98ca51f6 100755
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-    ${PROJECT_SOURCE_DIR}/catch
+    ${PROJECT_SOURCE_DIR}/libs/catch
     include
 )