diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8d3bf3..4b4ae86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,85 +29,13 @@ project(gattlib)
 
 find_package(PkgConfig REQUIRED)
 
-# Bluez specific files
-set(bluez4_SRCS bluez4/attrib/att.c
-                bluez4/attrib/gatt.c
-                bluez4/attrib/gattrib.c
-                bluez4/btio/btio.c
-                bluez4/lib/bluetooth.c
-                bluez4/lib/hci.c
-                bluez4/lib/sdp.c
-                bluez4/lib/uuid.c
-                bluez4/src/log.c)
-
-set(bluez5_SRCS bluez5/attrib/att.c
-                bluez5/attrib/gatt.c
-                bluez5/attrib/gattrib.c
-                bluez5/btio/btio.c
-                bluez5/lib/bluetooth.c
-                bluez5/lib/hci.c
-                bluez5/lib/sdp.c
-                bluez5/lib/uuid.c
-                bluez5/src/log.c
-                bluez5/src/shared/queue.c
-                bluez5/src/shared/util.c
-                bluez5/src/shared/mgmt.c
-                bluez5/src/shared/crypto.c
-                bluez5/src/shared/ecc.c
-                bluez5/src/shared/ringbuf.c
-                bluez5/src/shared/tester.c
-                bluez5/src/shared/hci.c
-                bluez5/src/shared/hci-crypto.c
-                bluez5/src/shared/hfp.c
-                bluez5/src/shared/uhid.c
-                bluez5/src/shared/pcap.c
-                bluez5/src/shared/btsnoop.c
-                bluez5/src/shared/ad.c
-                bluez5/src/shared/att.c
-                bluez5/src/shared/gatt-helpers.c
-                bluez5/src/shared/gatt-client.c
-                bluez5/src/shared/gatt-server.c
-                bluez5/src/shared/gatt-db.c
-                bluez5/src/shared/gap.c
-                bluez5/src/shared/io-glib.c
-                bluez5/src/shared/timeout-glib.c)
-
-# Gattlib files
-set(gattlib_SRCS src/gattlib_connect.c
-                 src/gattlib_discover.c
-                 src/gattlib_read_write.c)
-
-# Added Glib support
-pkg_search_module(GLIB REQUIRED glib-2.0)
-include_directories(${GLIB_INCLUDE_DIRS})
-list(APPEND gattlib_LIBS ${GLIB_LIBRARIES})
-
-# Added Bluetooth support
-pkg_search_module(BLUEZ REQUIRED bluez)
-include_directories(${BLUEZ_INCLUDE_DIRS})
-link_directories(${BLUEZ_LIBRARY_DIRS})
-list(APPEND gattlib_LIBS ${BLUEZ_LIBRARIES})
-# Extract Bluez version
-string(REPLACE "." ";" BLUEZ_VERSIONS "${BLUEZ_VERSION}")
-list(GET BLUEZ_VERSIONS 0 BLUEZ_VERSION_MAJOR)
-list(GET BLUEZ_VERSIONS 1 BLUEZ_VERSION_MINOR)
-add_definitions(-DBLUEZ_VERSION_MAJOR=${BLUEZ_VERSION_MAJOR} -DBLUEZ_VERSION_MINOR=${BLUEZ_VERSION_MINOR})
-
-if(BLUEZ_VERSION_MAJOR STREQUAL "4")
-  list(APPEND gattlib_SRCS ${bluez4_SRCS})
-  include_directories(include bluez4/attrib bluez4/btio bluez4/src bluez4/lib)
-else()
-  list(APPEND gattlib_SRCS ${bluez5_SRCS})
-  include_directories(include bluez5 bluez5/attrib bluez5/btio bluez5/lib)
-  add_definitions(-D_GNU_SOURCE)
-endif()
-
 # Show all the warnings
 set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+# Expose 'gattlib.h' to all sub-directories
+include_directories(include)
 
-# gattlib
-add_library(gattlib SHARED ${gattlib_SRCS})
-target_link_libraries(gattlib ${gattlib_LIBS})
+# Build bluez-based gattlib
+add_subdirectory(bluez)
 
 # Generate pkg-config file before building the examples
 configure_file(gattlib.pc.in gattlib.pc @ONLY)
@@ -143,7 +71,6 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libglib2.0-0")
 #
 # List of file to install
 #
-install(TARGETS gattlib LIBRARY DESTINATION lib)
 install(FILES include/gattlib.h DESTINATION include)
 install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION lib/pkgconfig)
 
diff --git a/bluez/CMakeLists.txt b/bluez/CMakeLists.txt
new file mode 100644
index 0000000..60c1f44
--- /dev/null
+++ b/bluez/CMakeLists.txt
@@ -0,0 +1,107 @@
+#
+#  GattLib - GATT Library
+#
+#  Copyright (C) 2016-2017  Olivier Martin <olivier@labapart.org>
+#
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+cmake_minimum_required(VERSION 2.6)
+
+find_package(PkgConfig REQUIRED)
+
+set(bluez4_DIR bluez4)
+set(bluez5_DIR bluez5) 
+
+# Bluez specific files
+set(bluez4_SRCS ${bluez4_DIR}/attrib/att.c
+                ${bluez4_DIR}/attrib/gatt.c
+                ${bluez4_DIR}/attrib/gattrib.c
+                ${bluez4_DIR}/btio/btio.c
+                ${bluez4_DIR}/lib/bluetooth.c
+                ${bluez4_DIR}/lib/hci.c
+                ${bluez4_DIR}/lib/sdp.c
+                ${bluez4_DIR}/lib/uuid.c
+                ${bluez4_DIR}/src/log.c)
+
+set(bluez5_SRCS ${bluez5_DIR}/attrib/att.c
+                ${bluez5_DIR}/attrib/gatt.c
+                ${bluez5_DIR}/attrib/gattrib.c
+                ${bluez5_DIR}/btio/btio.c
+                ${bluez5_DIR}/lib/bluetooth.c
+                ${bluez5_DIR}/lib/hci.c
+                ${bluez5_DIR}/lib/sdp.c
+                ${bluez5_DIR}/lib/uuid.c
+                ${bluez5_DIR}/src/log.c
+                ${bluez5_DIR}/src/shared/queue.c
+                ${bluez5_DIR}/src/shared/util.c
+                ${bluez5_DIR}/src/shared/mgmt.c
+                ${bluez5_DIR}/src/shared/crypto.c
+                ${bluez5_DIR}/src/shared/ecc.c
+                ${bluez5_DIR}/src/shared/ringbuf.c
+                ${bluez5_DIR}/src/shared/tester.c
+                ${bluez5_DIR}/src/shared/hci.c
+                ${bluez5_DIR}/src/shared/hci-crypto.c
+                ${bluez5_DIR}/src/shared/hfp.c
+                ${bluez5_DIR}/src/shared/uhid.c
+                ${bluez5_DIR}/src/shared/pcap.c
+                ${bluez5_DIR}/src/shared/btsnoop.c
+                ${bluez5_DIR}/src/shared/ad.c
+                ${bluez5_DIR}/src/shared/att.c
+                ${bluez5_DIR}/src/shared/gatt-helpers.c
+                ${bluez5_DIR}/src/shared/gatt-client.c
+                ${bluez5_DIR}/src/shared/gatt-server.c
+                ${bluez5_DIR}/src/shared/gatt-db.c
+                ${bluez5_DIR}/src/shared/gap.c
+                ${bluez5_DIR}/src/shared/io-glib.c
+                ${bluez5_DIR}/src/shared/timeout-glib.c)
+
+# Gattlib files
+set(gattlib_SRCS gattlib_connect.c
+                 gattlib_discover.c
+                 gattlib_read_write.c)
+
+# Added Glib support
+pkg_search_module(GLIB REQUIRED glib-2.0)
+include_directories(${GLIB_INCLUDE_DIRS})
+list(APPEND gattlib_LIBS ${GLIB_LIBRARIES})
+
+# Added Bluetooth support
+pkg_search_module(BLUEZ REQUIRED bluez)
+include_directories(${BLUEZ_INCLUDE_DIRS})
+link_directories(${BLUEZ_LIBRARY_DIRS})
+list(APPEND gattlib_LIBS ${BLUEZ_LIBRARIES})
+# Extract Bluez version
+string(REPLACE "." ";" BLUEZ_VERSIONS "${BLUEZ_VERSION}")
+list(GET BLUEZ_VERSIONS 0 BLUEZ_VERSION_MAJOR)
+list(GET BLUEZ_VERSIONS 1 BLUEZ_VERSION_MINOR)
+add_definitions(-DBLUEZ_VERSION_MAJOR=${BLUEZ_VERSION_MAJOR} -DBLUEZ_VERSION_MINOR=${BLUEZ_VERSION_MINOR})
+
+include_directories(.)
+if(BLUEZ_VERSION_MAJOR STREQUAL "4")
+  list(APPEND gattlib_SRCS ${bluez4_SRCS})
+  include_directories(${bluez4_DIR}/attrib ${bluez4_DIR}/btio ${bluez4_DIR}/src ${bluez4_DIR}/lib)
+else()
+  list(APPEND gattlib_SRCS ${bluez5_SRCS})
+  include_directories(${bluez5_DIR} ${bluez5_DIR}/attrib ${bluez5_DIR}/btio ${bluez5_DIR}/lib)
+  add_definitions(-D_GNU_SOURCE)
+endif()
+
+# gattlib
+add_library(gattlib SHARED ${gattlib_SRCS})
+target_link_libraries(gattlib ${gattlib_LIBS})
+
+install(TARGETS gattlib LIBRARY DESTINATION lib)
diff --git a/bluez4/attrib/att.c b/bluez/bluez4/attrib/att.c
similarity index 100%
rename from bluez4/attrib/att.c
rename to bluez/bluez4/attrib/att.c
diff --git a/bluez4/attrib/att.h b/bluez/bluez4/attrib/att.h
similarity index 100%
rename from bluez4/attrib/att.h
rename to bluez/bluez4/attrib/att.h
diff --git a/bluez4/attrib/gatt.c b/bluez/bluez4/attrib/gatt.c
similarity index 100%
rename from bluez4/attrib/gatt.c
rename to bluez/bluez4/attrib/gatt.c
diff --git a/bluez4/attrib/gatt.h b/bluez/bluez4/attrib/gatt.h
similarity index 100%
rename from bluez4/attrib/gatt.h
rename to bluez/bluez4/attrib/gatt.h
diff --git a/bluez4/attrib/gattrib.c b/bluez/bluez4/attrib/gattrib.c
similarity index 100%
rename from bluez4/attrib/gattrib.c
rename to bluez/bluez4/attrib/gattrib.c
diff --git a/bluez4/attrib/gattrib.h b/bluez/bluez4/attrib/gattrib.h
similarity index 100%
rename from bluez4/attrib/gattrib.h
rename to bluez/bluez4/attrib/gattrib.h
diff --git a/bluez4/btio/btio.c b/bluez/bluez4/btio/btio.c
similarity index 100%
rename from bluez4/btio/btio.c
rename to bluez/bluez4/btio/btio.c
diff --git a/bluez4/btio/btio.h b/bluez/bluez4/btio/btio.h
similarity index 100%
rename from bluez4/btio/btio.h
rename to bluez/bluez4/btio/btio.h
diff --git a/bluez4/lib/bluetooth.c b/bluez/bluez4/lib/bluetooth.c
similarity index 100%
rename from bluez4/lib/bluetooth.c
rename to bluez/bluez4/lib/bluetooth.c
diff --git a/bluez4/lib/bluetooth.h b/bluez/bluez4/lib/bluetooth.h
similarity index 100%
rename from bluez4/lib/bluetooth.h
rename to bluez/bluez4/lib/bluetooth.h
diff --git a/bluez4/lib/hci.c b/bluez/bluez4/lib/hci.c
similarity index 100%
rename from bluez4/lib/hci.c
rename to bluez/bluez4/lib/hci.c
diff --git a/bluez4/lib/hci.h b/bluez/bluez4/lib/hci.h
similarity index 100%
rename from bluez4/lib/hci.h
rename to bluez/bluez4/lib/hci.h
diff --git a/bluez4/lib/hci_lib.h b/bluez/bluez4/lib/hci_lib.h
similarity index 100%
rename from bluez4/lib/hci_lib.h
rename to bluez/bluez4/lib/hci_lib.h
diff --git a/bluez4/lib/l2cap.h b/bluez/bluez4/lib/l2cap.h
similarity index 100%
rename from bluez4/lib/l2cap.h
rename to bluez/bluez4/lib/l2cap.h
diff --git a/bluez4/lib/sdp.c b/bluez/bluez4/lib/sdp.c
similarity index 100%
rename from bluez4/lib/sdp.c
rename to bluez/bluez4/lib/sdp.c
diff --git a/bluez4/lib/sdp.h b/bluez/bluez4/lib/sdp.h
similarity index 100%
rename from bluez4/lib/sdp.h
rename to bluez/bluez4/lib/sdp.h
diff --git a/bluez4/lib/sdp_lib.h b/bluez/bluez4/lib/sdp_lib.h
similarity index 100%
rename from bluez4/lib/sdp_lib.h
rename to bluez/bluez4/lib/sdp_lib.h
diff --git a/bluez4/lib/uuid.c b/bluez/bluez4/lib/uuid.c
similarity index 100%
rename from bluez4/lib/uuid.c
rename to bluez/bluez4/lib/uuid.c
diff --git a/bluez4/lib/uuid.h b/bluez/bluez4/lib/uuid.h
similarity index 100%
rename from bluez4/lib/uuid.h
rename to bluez/bluez4/lib/uuid.h
diff --git a/bluez4/src/log.c b/bluez/bluez4/src/log.c
similarity index 100%
rename from bluez4/src/log.c
rename to bluez/bluez4/src/log.c
diff --git a/bluez4/src/log.h b/bluez/bluez4/src/log.h
similarity index 100%
rename from bluez4/src/log.h
rename to bluez/bluez4/src/log.h
diff --git a/bluez5/attrib/att-database.h b/bluez/bluez5/attrib/att-database.h
similarity index 100%
rename from bluez5/attrib/att-database.h
rename to bluez/bluez5/attrib/att-database.h
diff --git a/bluez5/attrib/att.c b/bluez/bluez5/attrib/att.c
similarity index 100%
rename from bluez5/attrib/att.c
rename to bluez/bluez5/attrib/att.c
diff --git a/bluez5/attrib/att.h b/bluez/bluez5/attrib/att.h
similarity index 100%
rename from bluez5/attrib/att.h
rename to bluez/bluez5/attrib/att.h
diff --git a/bluez5/attrib/gatt-service.h b/bluez/bluez5/attrib/gatt-service.h
similarity index 100%
rename from bluez5/attrib/gatt-service.h
rename to bluez/bluez5/attrib/gatt-service.h
diff --git a/bluez5/attrib/gatt.c b/bluez/bluez5/attrib/gatt.c
similarity index 100%
rename from bluez5/attrib/gatt.c
rename to bluez/bluez5/attrib/gatt.c
diff --git a/bluez5/attrib/gatt.h b/bluez/bluez5/attrib/gatt.h
similarity index 100%
rename from bluez5/attrib/gatt.h
rename to bluez/bluez5/attrib/gatt.h
diff --git a/bluez5/attrib/gattrib.c b/bluez/bluez5/attrib/gattrib.c
similarity index 100%
rename from bluez5/attrib/gattrib.c
rename to bluez/bluez5/attrib/gattrib.c
diff --git a/bluez5/attrib/gattrib.h b/bluez/bluez5/attrib/gattrib.h
similarity index 100%
rename from bluez5/attrib/gattrib.h
rename to bluez/bluez5/attrib/gattrib.h
diff --git a/bluez5/attrib/gatttool.h b/bluez/bluez5/attrib/gatttool.h
similarity index 100%
rename from bluez5/attrib/gatttool.h
rename to bluez/bluez5/attrib/gatttool.h
diff --git a/bluez5/btio/btio.c b/bluez/bluez5/btio/btio.c
similarity index 100%
rename from bluez5/btio/btio.c
rename to bluez/bluez5/btio/btio.c
diff --git a/bluez5/btio/btio.h b/bluez/bluez5/btio/btio.h
similarity index 100%
rename from bluez5/btio/btio.h
rename to bluez/bluez5/btio/btio.h
diff --git a/bluez5/lib/a2mp.h b/bluez/bluez5/lib/a2mp.h
similarity index 100%
rename from bluez5/lib/a2mp.h
rename to bluez/bluez5/lib/a2mp.h
diff --git a/bluez5/lib/amp.h b/bluez/bluez5/lib/amp.h
similarity index 100%
rename from bluez5/lib/amp.h
rename to bluez/bluez5/lib/amp.h
diff --git a/bluez5/lib/bluetooth.c b/bluez/bluez5/lib/bluetooth.c
similarity index 100%
rename from bluez5/lib/bluetooth.c
rename to bluez/bluez5/lib/bluetooth.c
diff --git a/bluez5/lib/bluetooth.h b/bluez/bluez5/lib/bluetooth.h
similarity index 100%
rename from bluez5/lib/bluetooth.h
rename to bluez/bluez5/lib/bluetooth.h
diff --git a/bluez5/lib/bluez.pc b/bluez/bluez5/lib/bluez.pc
similarity index 100%
rename from bluez5/lib/bluez.pc
rename to bluez/bluez5/lib/bluez.pc
diff --git a/bluez5/lib/bluez.pc.in b/bluez/bluez5/lib/bluez.pc.in
similarity index 100%
rename from bluez5/lib/bluez.pc.in
rename to bluez/bluez5/lib/bluez.pc.in
diff --git a/bluez5/lib/bnep.h b/bluez/bluez5/lib/bnep.h
similarity index 100%
rename from bluez5/lib/bnep.h
rename to bluez/bluez5/lib/bnep.h
diff --git a/bluez5/lib/cmtp.h b/bluez/bluez5/lib/cmtp.h
similarity index 100%
rename from bluez5/lib/cmtp.h
rename to bluez/bluez5/lib/cmtp.h
diff --git a/bluez5/lib/hci.c b/bluez/bluez5/lib/hci.c
similarity index 100%
rename from bluez5/lib/hci.c
rename to bluez/bluez5/lib/hci.c
diff --git a/bluez5/lib/hci.h b/bluez/bluez5/lib/hci.h
similarity index 100%
rename from bluez5/lib/hci.h
rename to bluez/bluez5/lib/hci.h
diff --git a/bluez5/lib/hci_lib.h b/bluez/bluez5/lib/hci_lib.h
similarity index 100%
rename from bluez5/lib/hci_lib.h
rename to bluez/bluez5/lib/hci_lib.h
diff --git a/bluez5/lib/hidp.h b/bluez/bluez5/lib/hidp.h
similarity index 100%
rename from bluez5/lib/hidp.h
rename to bluez/bluez5/lib/hidp.h
diff --git a/bluez5/lib/l2cap.h b/bluez/bluez5/lib/l2cap.h
similarity index 100%
rename from bluez5/lib/l2cap.h
rename to bluez/bluez5/lib/l2cap.h
diff --git a/bluez5/lib/libbluetooth-internal.la b/bluez/bluez5/lib/libbluetooth-internal.la
similarity index 100%
rename from bluez5/lib/libbluetooth-internal.la
rename to bluez/bluez5/lib/libbluetooth-internal.la
diff --git a/bluez5/lib/mgmt.h b/bluez/bluez5/lib/mgmt.h
similarity index 100%
rename from bluez5/lib/mgmt.h
rename to bluez/bluez5/lib/mgmt.h
diff --git a/bluez5/lib/rfcomm.h b/bluez/bluez5/lib/rfcomm.h
similarity index 100%
rename from bluez5/lib/rfcomm.h
rename to bluez/bluez5/lib/rfcomm.h
diff --git a/bluez5/lib/sco.h b/bluez/bluez5/lib/sco.h
similarity index 100%
rename from bluez5/lib/sco.h
rename to bluez/bluez5/lib/sco.h
diff --git a/bluez5/lib/sdp.c b/bluez/bluez5/lib/sdp.c
similarity index 100%
rename from bluez5/lib/sdp.c
rename to bluez/bluez5/lib/sdp.c
diff --git a/bluez5/lib/sdp.h b/bluez/bluez5/lib/sdp.h
similarity index 100%
rename from bluez5/lib/sdp.h
rename to bluez/bluez5/lib/sdp.h
diff --git a/bluez5/lib/sdp_lib.h b/bluez/bluez5/lib/sdp_lib.h
similarity index 100%
rename from bluez5/lib/sdp_lib.h
rename to bluez/bluez5/lib/sdp_lib.h
diff --git a/bluez5/lib/uuid.c b/bluez/bluez5/lib/uuid.c
similarity index 100%
rename from bluez5/lib/uuid.c
rename to bluez/bluez5/lib/uuid.c
diff --git a/bluez5/lib/uuid.h b/bluez/bluez5/lib/uuid.h
similarity index 100%
rename from bluez5/lib/uuid.h
rename to bluez/bluez5/lib/uuid.h
diff --git a/bluez5/monitor/bt.h b/bluez/bluez5/monitor/bt.h
similarity index 100%
rename from bluez5/monitor/bt.h
rename to bluez/bluez5/monitor/bt.h
diff --git a/bluez5/profiles/input/uhid_copy.h b/bluez/bluez5/profiles/input/uhid_copy.h
similarity index 100%
rename from bluez5/profiles/input/uhid_copy.h
rename to bluez/bluez5/profiles/input/uhid_copy.h
diff --git a/bluez5/src/eir.h b/bluez/bluez5/src/eir.h
similarity index 100%
rename from bluez5/src/eir.h
rename to bluez/bluez5/src/eir.h
diff --git a/bluez5/src/log.c b/bluez/bluez5/src/log.c
similarity index 100%
rename from bluez5/src/log.c
rename to bluez/bluez5/src/log.c
diff --git a/bluez5/src/log.h b/bluez/bluez5/src/log.h
similarity index 100%
rename from bluez5/src/log.h
rename to bluez/bluez5/src/log.h
diff --git a/bluez5/src/shared/ad.c b/bluez/bluez5/src/shared/ad.c
similarity index 100%
rename from bluez5/src/shared/ad.c
rename to bluez/bluez5/src/shared/ad.c
diff --git a/bluez5/src/shared/ad.h b/bluez/bluez5/src/shared/ad.h
similarity index 100%
rename from bluez5/src/shared/ad.h
rename to bluez/bluez5/src/shared/ad.h
diff --git a/bluez5/src/shared/att-types.h b/bluez/bluez5/src/shared/att-types.h
similarity index 100%
rename from bluez5/src/shared/att-types.h
rename to bluez/bluez5/src/shared/att-types.h
diff --git a/bluez5/src/shared/att.c b/bluez/bluez5/src/shared/att.c
similarity index 100%
rename from bluez5/src/shared/att.c
rename to bluez/bluez5/src/shared/att.c
diff --git a/bluez5/src/shared/att.h b/bluez/bluez5/src/shared/att.h
similarity index 100%
rename from bluez5/src/shared/att.h
rename to bluez/bluez5/src/shared/att.h
diff --git a/bluez5/src/shared/btsnoop.c b/bluez/bluez5/src/shared/btsnoop.c
similarity index 100%
rename from bluez5/src/shared/btsnoop.c
rename to bluez/bluez5/src/shared/btsnoop.c
diff --git a/bluez5/src/shared/btsnoop.h b/bluez/bluez5/src/shared/btsnoop.h
similarity index 100%
rename from bluez5/src/shared/btsnoop.h
rename to bluez/bluez5/src/shared/btsnoop.h
diff --git a/bluez5/src/shared/crypto.c b/bluez/bluez5/src/shared/crypto.c
similarity index 100%
rename from bluez5/src/shared/crypto.c
rename to bluez/bluez5/src/shared/crypto.c
diff --git a/bluez5/src/shared/crypto.h b/bluez/bluez5/src/shared/crypto.h
similarity index 100%
rename from bluez5/src/shared/crypto.h
rename to bluez/bluez5/src/shared/crypto.h
diff --git a/bluez5/src/shared/ecc.c b/bluez/bluez5/src/shared/ecc.c
similarity index 100%
rename from bluez5/src/shared/ecc.c
rename to bluez/bluez5/src/shared/ecc.c
diff --git a/bluez5/src/shared/ecc.h b/bluez/bluez5/src/shared/ecc.h
similarity index 100%
rename from bluez5/src/shared/ecc.h
rename to bluez/bluez5/src/shared/ecc.h
diff --git a/bluez5/src/shared/gap.c b/bluez/bluez5/src/shared/gap.c
similarity index 100%
rename from bluez5/src/shared/gap.c
rename to bluez/bluez5/src/shared/gap.c
diff --git a/bluez5/src/shared/gap.h b/bluez/bluez5/src/shared/gap.h
similarity index 100%
rename from bluez5/src/shared/gap.h
rename to bluez/bluez5/src/shared/gap.h
diff --git a/bluez5/src/shared/gatt-client.c b/bluez/bluez5/src/shared/gatt-client.c
similarity index 100%
rename from bluez5/src/shared/gatt-client.c
rename to bluez/bluez5/src/shared/gatt-client.c
diff --git a/bluez5/src/shared/gatt-client.h b/bluez/bluez5/src/shared/gatt-client.h
similarity index 100%
rename from bluez5/src/shared/gatt-client.h
rename to bluez/bluez5/src/shared/gatt-client.h
diff --git a/bluez5/src/shared/gatt-db.c b/bluez/bluez5/src/shared/gatt-db.c
similarity index 100%
rename from bluez5/src/shared/gatt-db.c
rename to bluez/bluez5/src/shared/gatt-db.c
diff --git a/bluez5/src/shared/gatt-db.h b/bluez/bluez5/src/shared/gatt-db.h
similarity index 100%
rename from bluez5/src/shared/gatt-db.h
rename to bluez/bluez5/src/shared/gatt-db.h
diff --git a/bluez5/src/shared/gatt-helpers.c b/bluez/bluez5/src/shared/gatt-helpers.c
similarity index 100%
rename from bluez5/src/shared/gatt-helpers.c
rename to bluez/bluez5/src/shared/gatt-helpers.c
diff --git a/bluez5/src/shared/gatt-helpers.h b/bluez/bluez5/src/shared/gatt-helpers.h
similarity index 100%
rename from bluez5/src/shared/gatt-helpers.h
rename to bluez/bluez5/src/shared/gatt-helpers.h
diff --git a/bluez5/src/shared/gatt-server.c b/bluez/bluez5/src/shared/gatt-server.c
similarity index 100%
rename from bluez5/src/shared/gatt-server.c
rename to bluez/bluez5/src/shared/gatt-server.c
diff --git a/bluez5/src/shared/gatt-server.h b/bluez/bluez5/src/shared/gatt-server.h
similarity index 100%
rename from bluez5/src/shared/gatt-server.h
rename to bluez/bluez5/src/shared/gatt-server.h
diff --git a/bluez5/src/shared/hci-crypto.c b/bluez/bluez5/src/shared/hci-crypto.c
similarity index 100%
rename from bluez5/src/shared/hci-crypto.c
rename to bluez/bluez5/src/shared/hci-crypto.c
diff --git a/bluez5/src/shared/hci-crypto.h b/bluez/bluez5/src/shared/hci-crypto.h
similarity index 100%
rename from bluez5/src/shared/hci-crypto.h
rename to bluez/bluez5/src/shared/hci-crypto.h
diff --git a/bluez5/src/shared/hci.c b/bluez/bluez5/src/shared/hci.c
similarity index 100%
rename from bluez5/src/shared/hci.c
rename to bluez/bluez5/src/shared/hci.c
diff --git a/bluez5/src/shared/hci.h b/bluez/bluez5/src/shared/hci.h
similarity index 100%
rename from bluez5/src/shared/hci.h
rename to bluez/bluez5/src/shared/hci.h
diff --git a/bluez5/src/shared/hfp.c b/bluez/bluez5/src/shared/hfp.c
similarity index 100%
rename from bluez5/src/shared/hfp.c
rename to bluez/bluez5/src/shared/hfp.c
diff --git a/bluez5/src/shared/hfp.h b/bluez/bluez5/src/shared/hfp.h
similarity index 100%
rename from bluez5/src/shared/hfp.h
rename to bluez/bluez5/src/shared/hfp.h
diff --git a/bluez5/src/shared/io-glib.c b/bluez/bluez5/src/shared/io-glib.c
similarity index 100%
rename from bluez5/src/shared/io-glib.c
rename to bluez/bluez5/src/shared/io-glib.c
diff --git a/bluez5/src/shared/io.h b/bluez/bluez5/src/shared/io.h
similarity index 100%
rename from bluez5/src/shared/io.h
rename to bluez/bluez5/src/shared/io.h
diff --git a/bluez5/src/shared/mainloop.c b/bluez/bluez5/src/shared/mainloop.c
similarity index 100%
rename from bluez5/src/shared/mainloop.c
rename to bluez/bluez5/src/shared/mainloop.c
diff --git a/bluez5/src/shared/mainloop.h b/bluez/bluez5/src/shared/mainloop.h
similarity index 100%
rename from bluez5/src/shared/mainloop.h
rename to bluez/bluez5/src/shared/mainloop.h
diff --git a/bluez5/src/shared/mgmt.c b/bluez/bluez5/src/shared/mgmt.c
similarity index 100%
rename from bluez5/src/shared/mgmt.c
rename to bluez/bluez5/src/shared/mgmt.c
diff --git a/bluez5/src/shared/mgmt.h b/bluez/bluez5/src/shared/mgmt.h
similarity index 100%
rename from bluez5/src/shared/mgmt.h
rename to bluez/bluez5/src/shared/mgmt.h
diff --git a/bluez5/src/shared/pcap.c b/bluez/bluez5/src/shared/pcap.c
similarity index 100%
rename from bluez5/src/shared/pcap.c
rename to bluez/bluez5/src/shared/pcap.c
diff --git a/bluez5/src/shared/pcap.h b/bluez/bluez5/src/shared/pcap.h
similarity index 100%
rename from bluez5/src/shared/pcap.h
rename to bluez/bluez5/src/shared/pcap.h
diff --git a/bluez5/src/shared/queue.c b/bluez/bluez5/src/shared/queue.c
similarity index 100%
rename from bluez5/src/shared/queue.c
rename to bluez/bluez5/src/shared/queue.c
diff --git a/bluez5/src/shared/queue.h b/bluez/bluez5/src/shared/queue.h
similarity index 100%
rename from bluez5/src/shared/queue.h
rename to bluez/bluez5/src/shared/queue.h
diff --git a/bluez5/src/shared/ringbuf.c b/bluez/bluez5/src/shared/ringbuf.c
similarity index 100%
rename from bluez5/src/shared/ringbuf.c
rename to bluez/bluez5/src/shared/ringbuf.c
diff --git a/bluez5/src/shared/ringbuf.h b/bluez/bluez5/src/shared/ringbuf.h
similarity index 100%
rename from bluez5/src/shared/ringbuf.h
rename to bluez/bluez5/src/shared/ringbuf.h
diff --git a/bluez5/src/shared/tester.c b/bluez/bluez5/src/shared/tester.c
similarity index 100%
rename from bluez5/src/shared/tester.c
rename to bluez/bluez5/src/shared/tester.c
diff --git a/bluez5/src/shared/tester.h b/bluez/bluez5/src/shared/tester.h
similarity index 100%
rename from bluez5/src/shared/tester.h
rename to bluez/bluez5/src/shared/tester.h
diff --git a/bluez5/src/shared/timeout-glib.c b/bluez/bluez5/src/shared/timeout-glib.c
similarity index 100%
rename from bluez5/src/shared/timeout-glib.c
rename to bluez/bluez5/src/shared/timeout-glib.c
diff --git a/bluez5/src/shared/timeout-mainloop.c b/bluez/bluez5/src/shared/timeout-mainloop.c
similarity index 100%
rename from bluez5/src/shared/timeout-mainloop.c
rename to bluez/bluez5/src/shared/timeout-mainloop.c
diff --git a/bluez5/src/shared/timeout.h b/bluez/bluez5/src/shared/timeout.h
similarity index 100%
rename from bluez5/src/shared/timeout.h
rename to bluez/bluez5/src/shared/timeout.h
diff --git a/bluez5/src/shared/tty.h b/bluez/bluez5/src/shared/tty.h
similarity index 100%
rename from bluez5/src/shared/tty.h
rename to bluez/bluez5/src/shared/tty.h
diff --git a/bluez5/src/shared/uhid.c b/bluez/bluez5/src/shared/uhid.c
similarity index 100%
rename from bluez5/src/shared/uhid.c
rename to bluez/bluez5/src/shared/uhid.c
diff --git a/bluez5/src/shared/uhid.h b/bluez/bluez5/src/shared/uhid.h
similarity index 100%
rename from bluez5/src/shared/uhid.h
rename to bluez/bluez5/src/shared/uhid.h
diff --git a/bluez5/src/shared/util.c b/bluez/bluez5/src/shared/util.c
similarity index 100%
rename from bluez5/src/shared/util.c
rename to bluez/bluez5/src/shared/util.c
diff --git a/bluez5/src/shared/util.h b/bluez/bluez5/src/shared/util.h
similarity index 100%
rename from bluez5/src/shared/util.h
rename to bluez/bluez5/src/shared/util.h
diff --git a/src/gattlib_connect.c b/bluez/gattlib_connect.c
similarity index 100%
rename from src/gattlib_connect.c
rename to bluez/gattlib_connect.c
diff --git a/src/gattlib_discover.c b/bluez/gattlib_discover.c
similarity index 100%
rename from src/gattlib_discover.c
rename to bluez/gattlib_discover.c
diff --git a/include/gattlib_internal.h b/bluez/gattlib_internal.h
similarity index 100%
rename from include/gattlib_internal.h
rename to bluez/gattlib_internal.h
diff --git a/src/gattlib_read_write.c b/bluez/gattlib_read_write.c
similarity index 100%
rename from src/gattlib_read_write.c
rename to bluez/gattlib_read_write.c