diff --git a/.idea/misc.xml b/.idea/misc.xml
index 79b3c94..3b5d262 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+  <component name="CidrRootsConfiguration">
+    <sourceRoots>
+      <file path="$PROJECT_DIR$/include" />
+    </sourceRoots>
+  </component>
 </project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 742a5a7..f7f3add 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,19 @@ cmake_minimum_required(VERSION 3.9)
 project(t2b)
 
 set(CMAKE_CXX_STANDARD 11)
-set(T2B_SOURCES t2b.cc t2b.hpp)
+set(T2B_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
+set(T2B_SOURCES src/t2b.cc include/t2b.hpp)
 
 add_library(t2b SHARED ${T2B_SOURCES})
 add_library(t2b_static STATIC ${T2B_SOURCES})
-add_executable(t2b_exe main.cc)
+add_executable(t2b_exe src/main.cc)
 set_target_properties(t2b_static t2b_exe PROPERTIES OUTPUT_NAME t2b)
+target_include_directories(t2b PUBLIC ${T2B_INCLUDE_DIRS})
+target_include_directories(t2b_exe PUBLIC ${T2B_INCLUDE_DIRS})
+target_include_directories(t2b_static PUBLIC ${T2B_INCLUDE_DIRS})
 target_link_libraries(t2b_exe t2b)
 install(TARGETS t2b t2b_exe
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib)
\ No newline at end of file
+        ARCHIVE DESTINATION lib)
+install(DIRECTORY include DESTINATION include)
\ No newline at end of file
diff --git a/t2b.hpp b/include/t2b.hpp
similarity index 100%
rename from t2b.hpp
rename to include/t2b.hpp
diff --git a/main.cc b/src/main.cc
similarity index 98%
rename from main.cc
rename to src/main.cc
index 6dc7ad7..aa9ca9e 100644
--- a/main.cc
+++ b/src/main.cc
@@ -12,7 +12,7 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
-#include "t2b.hpp"
+#include <t2b.hpp>
 
 using namespace t2b;
 
diff --git a/t2b.cc b/src/t2b.cc
similarity index 99%
rename from t2b.cc
rename to src/t2b.cc
index ba07c1e..245fe42 100644
--- a/t2b.cc
+++ b/src/t2b.cc
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <sstream>
 #include <regex>
-#include "t2b.hpp"
+#include <t2b.hpp>
 
 using namespace t2b;