diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ef4083..6f266f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ project (libsettable)
 
 find_package(Boost)
 
-include_directories(${Boost_INCLUDE_DIRS})
+include_directories(${PROJECT_SOURCE_DIR}/src
+                    ${Boost_INCLUDE_DIRS})
 
 add_subdirectory(examples)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c5cd9fd..f53b323 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,6 +1,3 @@
 cmake_minimum_required (VERSION 2.6)
-project (Demo)
-
-include_directories( .. )
 
 add_executable(Demo demo.cpp)
diff --git a/attributes.hpp b/src/attributes.hpp
similarity index 100%
rename from attributes.hpp
rename to src/attributes.hpp
diff --git a/string2type.hpp b/src/string2type.hpp
similarity index 100%
rename from string2type.hpp
rename to src/string2type.hpp