diff --git a/cmake/options.cmake b/cmake/options.cmake
new file mode 100644
index 0000000..5c00d02
--- /dev/null
+++ b/cmake/options.cmake
@@ -0,0 +1 @@
+Option                      ( CPPAMQP_BUILD_SHARED "Build cppamqp shared library" OFF )
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b2d0c3..6353f38 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,9 @@ Include                     ( cotire OPTIONAL )
 Include                     ( pedantic OPTIONAL )
 Include                     ( strip_symbols OPTIONAL )
 
-Option                      ( BUILD_SHARED_CPPAMQP "Build cppamqp shared library" OFF )
+Include                     ( ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/options.cmake )
 
-Set                         ( BUILD_SHARED_LIBS ${BUILD_SHARED_CPPAMQP} )
+Set                         ( BUILD_SHARED_LIBS ${CPPAMQP_BUILD_SHARED} )
 Set                         ( CMAKE_CXX_STANDARD 17 )
 Set                         ( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${PEDANTIC_C_FLAGS}" )
 Set                         ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" )
@@ -14,6 +14,7 @@ Set                         ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX
 # Dependencies ####################################################################################
 
 Find_Package                ( cpputils REQUIRED )
+Find_Package                ( rabbitmq REQUIRED )
 
 # Project: cppamqp ###############################################################################
 
@@ -27,6 +28,7 @@ Target_Include_Directories  (
 Target_Link_Libraries       (
                                 cppamqp
                                 cpputils
+                                rabbitmq
                             )
 If                          ( __COTIRE_INCLUDED )
     Cotire                      ( cppamqp )
diff --git a/src/channel.cpp b/src/cppamqp/channel.cpp
similarity index 100%
rename from src/channel.cpp
rename to src/cppamqp/channel.cpp
diff --git a/src/connection.cpp b/src/cppamqp/connection.cpp
similarity index 100%
rename from src/connection.cpp
rename to src/cppamqp/connection.cpp
diff --git a/src/helper.cpp b/src/cppamqp/helper.cpp
similarity index 100%
rename from src/helper.cpp
rename to src/cppamqp/helper.cpp
diff --git a/src/publish_options.cpp b/src/cppamqp/publish_options.cpp
similarity index 100%
rename from src/publish_options.cpp
rename to src/cppamqp/publish_options.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5a5e4f4..24ef895 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,6 +4,8 @@ Include                     ( cotire OPTIONAL )
 Include                     ( pedantic OPTIONAL )
 Include                     ( cmake_tests OPTIONAL )
 
+Include                     ( ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/options.cmake )
+
 Set                         ( CMAKE_CXX_STANDARD 17 )
 Set                         ( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${PEDANTIC_C_FLAGS}" )
 Set                         ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" )