diff --git a/CMakeLists.txt b/CMakeLists.txt
index b683fcb..4d079ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,8 +102,8 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
 # Congiguration file
 CONFIGURE_FILE(
-  "${PROJECT_SOURCE_DIR}/include/config.h.in"
-  "${PROJECT_SOURCE_DIR}/include/config.h"
+  "${PROJECT_SOURCE_DIR}/include/tins/config.h.in"
+  "${PROJECT_SOURCE_DIR}/include/tins/config.h"
 )
 
 ENABLE_TESTING()
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 3737ced..1d59e55 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,7 +1 @@
-FILE(GLOB INCLUDE_FILES "*.h")
-INSTALL(
-    FILES ${INCLUDE_FILES} 
-    DESTINATION include/tins
-    COMPONENT Headers
-)
-ADD_SUBDIRECTORY(dot11)
+ADD_SUBDIRECTORY(tins)
diff --git a/include/tins/CMakeLists.txt b/include/tins/CMakeLists.txt
new file mode 100644
index 0000000..3737ced
--- /dev/null
+++ b/include/tins/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB INCLUDE_FILES "*.h")
+INSTALL(
+    FILES ${INCLUDE_FILES} 
+    DESTINATION include/tins
+    COMPONENT Headers
+)
+ADD_SUBDIRECTORY(dot11)
diff --git a/include/address_range.h b/include/tins/address_range.h
similarity index 100%
rename from include/address_range.h
rename to include/tins/address_range.h
diff --git a/include/arp.h b/include/tins/arp.h
similarity index 100%
rename from include/arp.h
rename to include/tins/arp.h
diff --git a/include/bootp.h b/include/tins/bootp.h
similarity index 100%
rename from include/bootp.h
rename to include/tins/bootp.h
diff --git a/include/tins/config.h b/include/tins/config.h
new file mode 100644
index 0000000..23672e8
--- /dev/null
+++ b/include/tins/config.h
@@ -0,0 +1,9 @@
+
+/* Define if the compiler supports basic C++11 syntax */
+#define HAVE_CXX11
+
+/* Have IEEE 802.11 support */
+#define HAVE_DOT11
+
+/* Have WPA2 decryption library */
+#define HAVE_WPA2_DECRYPTION
diff --git a/include/config.h.in b/include/tins/config.h.in
similarity index 100%
rename from include/config.h.in
rename to include/tins/config.h.in
diff --git a/include/constants.h b/include/tins/constants.h
similarity index 100%
rename from include/constants.h
rename to include/tins/constants.h
diff --git a/include/crypto.h b/include/tins/crypto.h
similarity index 100%
rename from include/crypto.h
rename to include/tins/crypto.h
diff --git a/include/cxxstd.h b/include/tins/cxxstd.h
similarity index 100%
rename from include/cxxstd.h
rename to include/tins/cxxstd.h
diff --git a/include/data_link_type.h b/include/tins/data_link_type.h
similarity index 100%
rename from include/data_link_type.h
rename to include/tins/data_link_type.h
diff --git a/include/dhcp.h b/include/tins/dhcp.h
similarity index 100%
rename from include/dhcp.h
rename to include/tins/dhcp.h
diff --git a/include/dhcpv6.h b/include/tins/dhcpv6.h
similarity index 100%
rename from include/dhcpv6.h
rename to include/tins/dhcpv6.h
diff --git a/include/dns.h b/include/tins/dns.h
similarity index 100%
rename from include/dns.h
rename to include/tins/dns.h
diff --git a/include/dot11.h b/include/tins/dot11.h
similarity index 100%
rename from include/dot11.h
rename to include/tins/dot11.h
diff --git a/include/dot11/CMakeLists.txt b/include/tins/dot11/CMakeLists.txt
similarity index 100%
rename from include/dot11/CMakeLists.txt
rename to include/tins/dot11/CMakeLists.txt
diff --git a/include/dot11/dot11_assoc.h b/include/tins/dot11/dot11_assoc.h
similarity index 100%
rename from include/dot11/dot11_assoc.h
rename to include/tins/dot11/dot11_assoc.h
diff --git a/include/dot11/dot11_auth.h b/include/tins/dot11/dot11_auth.h
similarity index 100%
rename from include/dot11/dot11_auth.h
rename to include/tins/dot11/dot11_auth.h
diff --git a/include/dot11/dot11_base.h b/include/tins/dot11/dot11_base.h
similarity index 100%
rename from include/dot11/dot11_base.h
rename to include/tins/dot11/dot11_base.h
diff --git a/include/dot11/dot11_beacon.h b/include/tins/dot11/dot11_beacon.h
similarity index 100%
rename from include/dot11/dot11_beacon.h
rename to include/tins/dot11/dot11_beacon.h
diff --git a/include/dot11/dot11_control.h b/include/tins/dot11/dot11_control.h
similarity index 100%
rename from include/dot11/dot11_control.h
rename to include/tins/dot11/dot11_control.h
diff --git a/include/dot11/dot11_data.h b/include/tins/dot11/dot11_data.h
similarity index 100%
rename from include/dot11/dot11_data.h
rename to include/tins/dot11/dot11_data.h
diff --git a/include/dot11/dot11_mgmt.h b/include/tins/dot11/dot11_mgmt.h
similarity index 100%
rename from include/dot11/dot11_mgmt.h
rename to include/tins/dot11/dot11_mgmt.h
diff --git a/include/dot11/dot11_probe.h b/include/tins/dot11/dot11_probe.h
similarity index 100%
rename from include/dot11/dot11_probe.h
rename to include/tins/dot11/dot11_probe.h
diff --git a/include/dot1q.h b/include/tins/dot1q.h
similarity index 100%
rename from include/dot1q.h
rename to include/tins/dot1q.h
diff --git a/include/dot3.h b/include/tins/dot3.h
similarity index 100%
rename from include/dot3.h
rename to include/tins/dot3.h
diff --git a/include/eapol.h b/include/tins/eapol.h
similarity index 100%
rename from include/eapol.h
rename to include/tins/eapol.h
diff --git a/include/endianness.h b/include/tins/endianness.h
similarity index 100%
rename from include/endianness.h
rename to include/tins/endianness.h
diff --git a/include/ethernetII.h b/include/tins/ethernetII.h
similarity index 100%
rename from include/ethernetII.h
rename to include/tins/ethernetII.h
diff --git a/include/exceptions.h b/include/tins/exceptions.h
similarity index 100%
rename from include/exceptions.h
rename to include/tins/exceptions.h
diff --git a/include/handshake_capturer.h b/include/tins/handshake_capturer.h
similarity index 100%
rename from include/handshake_capturer.h
rename to include/tins/handshake_capturer.h
diff --git a/include/hw_address.h b/include/tins/hw_address.h
similarity index 100%
rename from include/hw_address.h
rename to include/tins/hw_address.h
diff --git a/include/icmp.h b/include/tins/icmp.h
similarity index 100%
rename from include/icmp.h
rename to include/tins/icmp.h
diff --git a/include/icmpv6.h b/include/tins/icmpv6.h
similarity index 100%
rename from include/icmpv6.h
rename to include/tins/icmpv6.h
diff --git a/include/ieee802_3.h b/include/tins/ieee802_3.h
similarity index 100%
rename from include/ieee802_3.h
rename to include/tins/ieee802_3.h
diff --git a/include/internals.h b/include/tins/internals.h
similarity index 100%
rename from include/internals.h
rename to include/tins/internals.h
diff --git a/include/ip.h b/include/tins/ip.h
similarity index 100%
rename from include/ip.h
rename to include/tins/ip.h
diff --git a/include/ip_address.h b/include/tins/ip_address.h
similarity index 100%
rename from include/ip_address.h
rename to include/tins/ip_address.h
diff --git a/include/ip_reassembler.h b/include/tins/ip_reassembler.h
similarity index 100%
rename from include/ip_reassembler.h
rename to include/tins/ip_reassembler.h
diff --git a/include/ipsec.h b/include/tins/ipsec.h
similarity index 100%
rename from include/ipsec.h
rename to include/tins/ipsec.h
diff --git a/include/ipv6.h b/include/tins/ipv6.h
similarity index 100%
rename from include/ipv6.h
rename to include/tins/ipv6.h
diff --git a/include/ipv6_address.h b/include/tins/ipv6_address.h
similarity index 100%
rename from include/ipv6_address.h
rename to include/tins/ipv6_address.h
diff --git a/include/llc.h b/include/tins/llc.h
similarity index 100%
rename from include/llc.h
rename to include/tins/llc.h
diff --git a/include/loopback.h b/include/tins/loopback.h
similarity index 100%
rename from include/loopback.h
rename to include/tins/loopback.h
diff --git a/include/macros.h b/include/tins/macros.h
similarity index 100%
rename from include/macros.h
rename to include/tins/macros.h
diff --git a/include/network_interface.h b/include/tins/network_interface.h
similarity index 100%
rename from include/network_interface.h
rename to include/tins/network_interface.h
diff --git a/include/offline_packet_filter.h b/include/tins/offline_packet_filter.h
similarity index 100%
rename from include/offline_packet_filter.h
rename to include/tins/offline_packet_filter.h
diff --git a/include/packet.h b/include/tins/packet.h
similarity index 100%
rename from include/packet.h
rename to include/tins/packet.h
diff --git a/include/packet_sender.h b/include/tins/packet_sender.h
similarity index 100%
rename from include/packet_sender.h
rename to include/tins/packet_sender.h
diff --git a/include/packet_writer.h b/include/tins/packet_writer.h
similarity index 100%
rename from include/packet_writer.h
rename to include/tins/packet_writer.h
diff --git a/include/pdu.h b/include/tins/pdu.h
similarity index 100%
rename from include/pdu.h
rename to include/tins/pdu.h
diff --git a/include/pdu_allocator.h b/include/tins/pdu_allocator.h
similarity index 100%
rename from include/pdu_allocator.h
rename to include/tins/pdu_allocator.h
diff --git a/include/pdu_cacher.h b/include/tins/pdu_cacher.h
similarity index 100%
rename from include/pdu_cacher.h
rename to include/tins/pdu_cacher.h
diff --git a/include/pdu_option.h b/include/tins/pdu_option.h
similarity index 100%
rename from include/pdu_option.h
rename to include/tins/pdu_option.h
diff --git a/include/ppi.h b/include/tins/ppi.h
similarity index 100%
rename from include/ppi.h
rename to include/tins/ppi.h
diff --git a/include/pppoe.h b/include/tins/pppoe.h
similarity index 100%
rename from include/pppoe.h
rename to include/tins/pppoe.h
diff --git a/include/radiotap.h b/include/tins/radiotap.h
similarity index 100%
rename from include/radiotap.h
rename to include/tins/radiotap.h
diff --git a/include/rawpdu.h b/include/tins/rawpdu.h
similarity index 100%
rename from include/rawpdu.h
rename to include/tins/rawpdu.h
diff --git a/include/rsn_information.h b/include/tins/rsn_information.h
similarity index 100%
rename from include/rsn_information.h
rename to include/tins/rsn_information.h
diff --git a/include/sll.h b/include/tins/sll.h
similarity index 100%
rename from include/sll.h
rename to include/tins/sll.h
diff --git a/include/small_uint.h b/include/tins/small_uint.h
similarity index 100%
rename from include/small_uint.h
rename to include/tins/small_uint.h
diff --git a/include/snap.h b/include/tins/snap.h
similarity index 100%
rename from include/snap.h
rename to include/tins/snap.h
diff --git a/include/sniffer.h b/include/tins/sniffer.h
similarity index 100%
rename from include/sniffer.h
rename to include/tins/sniffer.h
diff --git a/include/stp.h b/include/tins/stp.h
similarity index 100%
rename from include/stp.h
rename to include/tins/stp.h
diff --git a/include/tcp.h b/include/tins/tcp.h
similarity index 100%
rename from include/tcp.h
rename to include/tins/tcp.h
diff --git a/include/tcp_stream.h b/include/tins/tcp_stream.h
similarity index 100%
rename from include/tcp_stream.h
rename to include/tins/tcp_stream.h
diff --git a/include/timestamp.h b/include/tins/timestamp.h
similarity index 100%
rename from include/timestamp.h
rename to include/tins/timestamp.h
diff --git a/include/tins.h b/include/tins/tins.h
similarity index 100%
rename from include/tins.h
rename to include/tins/tins.h
diff --git a/include/udp.h b/include/tins/udp.h
similarity index 100%
rename from include/udp.h
rename to include/tins/udp.h
diff --git a/include/utils.h b/include/tins/utils.h
similarity index 100%
rename from include/utils.h
rename to include/tins/utils.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1a6299a..1165c72 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(LIBTINS_INCLUDE_DIR ../include)
+SET(LIBTINS_INCLUDE_DIR ../include/tins/)
 
 INCLUDE_DIRECTORIES(
     ${LIBTINS_INCLUDE_DIR}