diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eabe32..b9530f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,12 +10,12 @@ SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb")
 #SET (CMAKE_C_FLAGS_REL " -Wall -O3")
 #SET (CMAKE_CXX_FLAGS_REL " -Wall -O3")
 
-include_directories(dispatchkit chaiscript)
+include_directories(include)
  
 find_package(Boost 1.36.0)
 if (Boost_FOUND)
 	include_directories(${Boost_INCLUDE_DIRS})
-	add_executable(chaiscript_eval chaiscript/main.cpp)
+	add_executable(chaiscript_eval src/main.cpp)
 	#add_executable(dispatchkit_test dispatchkit/test.cpp)
 	target_link_libraries(chaiscript_eval ${Boost_LIBRARIES})
 	install(TARGETS chaiscript_eval DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/bin)
diff --git a/include/chaiscript/chaiscript.hpp b/include/chaiscript/chaiscript.hpp
index 3ded5c4..61f2e6a 100644
--- a/include/chaiscript/chaiscript.hpp
+++ b/include/chaiscript/chaiscript.hpp
@@ -14,9 +14,9 @@
 #include <fstream>
 #include <boost/shared_ptr.hpp>
 
-#include "dispatchkit.hpp"
-#include "bootstrap.hpp"
-#include "bootstrap_stl.hpp"
+#include <chaiscript/dispatchkit/dispatchkit.hpp>
+#include <chaiscript/dispatchkit/bootstrap.hpp>
+#include <chaiscript/dispatchkit/bootstrap_stl.hpp>
 
 namespace chaiscript
 {
@@ -133,7 +133,7 @@ namespace chaiscript
     };
 }
 
-#include "chaiscript_eval.hpp"
-#include "chaiscript_engine.hpp"
+#include <chaiscript/language/chaiscript_eval.hpp>
+#include <chaiscript/language/chaiscript_engine.hpp>
 
 #endif /* CHAISCRIPT_HPP_ */
diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp
index c518333..f3e73da 100644
--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -1,8 +1,8 @@
 #ifndef __bootstrap_hpp
 #define __bootstrap_hpp__
 
-#include "dispatchkit.hpp"
-#include "register_function.hpp"
+#include <chaiscript/dispatchkit/dispatchkit.hpp>
+#include <chaiscript/dispatchkit/register_function.hpp>
 
 namespace dispatchkit
 {
diff --git a/include/chaiscript/dispatchkit/bootstrap_stl.hpp b/include/chaiscript/dispatchkit/bootstrap_stl.hpp
index cd225ce..7a96c2a 100644
--- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp
@@ -1,8 +1,8 @@
 #ifndef __bootstrap_stl_hpp
 #define __bootstrap_stl_hpp__
 
-#include "dispatchkit.hpp"
-#include "register_function.hpp"
+#include <chaiscript/dispatchkit/dispatchkit.hpp>
+#include <chaiscript/dispatchkit/register_function.hpp>
 
 
 namespace dispatchkit
diff --git a/include/chaiscript/dispatchkit/boxed_value.hpp b/include/chaiscript/dispatchkit/boxed_value.hpp
index 924216e..88bc402 100644
--- a/include/chaiscript/dispatchkit/boxed_value.hpp
+++ b/include/chaiscript/dispatchkit/boxed_value.hpp
@@ -1,7 +1,7 @@
 #ifndef __boxed_value_hpp__
 #define __boxed_value_hpp__
 
-#include "type_info.hpp"
+#include <chaiscript/dispatchkit/type_info.hpp>
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <boost/any.hpp>
diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp
index 2741819..557468e 100644
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -12,10 +12,10 @@
 #include <iostream>
 #include <deque>
 
-#include "boxed_value.hpp"
-#include "type_info.hpp"
-#include "proxy_functions.hpp"
-#include "proxy_constructors.hpp"
+#include <chaiscript/dispatchkit/boxed_value.hpp>
+#include <chaiscript/dispatchkit/type_info.hpp>
+#include <chaiscript/dispatchkit/proxy_functions.hpp>
+#include <chaiscript/dispatchkit/proxy_constructors.hpp>
 
 namespace dispatchkit
 {
diff --git a/include/chaiscript/dispatchkit/function_call.hpp b/include/chaiscript/dispatchkit/function_call.hpp
index 1c16e46..c08bbeb 100644
--- a/include/chaiscript/dispatchkit/function_call.hpp
+++ b/include/chaiscript/dispatchkit/function_call.hpp
@@ -13,7 +13,7 @@
 #include <boost/function.hpp>
 #include <string>
 #include <vector>
-#include "proxy_functions.hpp"
+#include <chaiscript/dispatchkit/proxy_functions.hpp>
 
 namespace dispatchkit
 {
diff --git a/include/chaiscript/dispatchkit/proxy_constructors.hpp b/include/chaiscript/dispatchkit/proxy_constructors.hpp
index ca59884..694c7ae 100644
--- a/include/chaiscript/dispatchkit/proxy_constructors.hpp
+++ b/include/chaiscript/dispatchkit/proxy_constructors.hpp
@@ -10,7 +10,8 @@
 
 
 #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
-#define BOOST_PP_FILENAME_1 "proxy_constructors.hpp"
+//#define BOOST_PP_FILENAME_1 "proxy_constructors.hpp"
+#define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/proxy_constructors.hpp>
 #include BOOST_PP_ITERATE()
 # endif
 #else
diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
index f087f2d..55bf24f 100644
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -10,8 +10,8 @@
 #ifndef __proxy_functions_hpp__
 #define __proxy_functions_hpp__
 
-#include "boxed_value.hpp"
-#include "type_info.hpp"
+#include <chaiscript/dispatchkit/boxed_value.hpp>
+#include <chaiscript/dispatchkit/type_info.hpp>
 #include <string>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
@@ -109,7 +109,8 @@ namespace dispatchkit
 }
 
 #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
-#define BOOST_PP_FILENAME_1 "proxy_functions.hpp"
+//#define BOOST_PP_FILENAME_1 "proxy_functions.hpp"
+#define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/proxy_functions.hpp>
 #include BOOST_PP_ITERATE()
 
 namespace dispatchkit
diff --git a/include/chaiscript/dispatchkit/register_function.hpp b/include/chaiscript/dispatchkit/register_function.hpp
index 7daf4b9..e7ec21a 100644
--- a/include/chaiscript/dispatchkit/register_function.hpp
+++ b/include/chaiscript/dispatchkit/register_function.hpp
@@ -4,7 +4,7 @@
 #ifndef __register_function_hpp__
 #define __register_function_hpp__
 
-#include "dispatchkit.hpp"
+#include <chaiscript/dispatchkit/dispatchkit.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 
@@ -24,8 +24,8 @@ namespace dispatchkit
 }
 
 #define BOOST_PP_ITERATION_LIMITS ( 0, 10 )
-#define BOOST_PP_FILENAME_1 "register_function.hpp"
-
+//#define BOOST_PP_FILENAME_1 "register_function.hpp"
+#define BOOST_PP_FILENAME_1 <chaiscript/dispatchkit/register_function.hpp>
 #include BOOST_PP_ITERATE()
 
 # endif
diff --git a/include/chaiscript/dispatchkit/test.cpp b/include/chaiscript/dispatchkit/test.cpp
index 0fdedc6..263cbd8 100644
--- a/include/chaiscript/dispatchkit/test.cpp
+++ b/include/chaiscript/dispatchkit/test.cpp
@@ -4,10 +4,10 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 
-#include "dispatchkit.hpp"
-#include "bootstrap.hpp"
-#include "bootstrap_stl.hpp"
-#include "function_call.hpp"
+#include <chaiscript/dispatchkit/dispatchkit.hpp>
+#include <chaiscript/dispatchkit/bootstrap.hpp>
+#include <chaiscript/dispatchkit/bootstrap_stl.hpp>
+#include <chaiscript/dispatchkit/function_call.hpp>
 
 using namespace dispatchkit;
 
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
index fdac75c..8078d91 100644
--- a/include/chaiscript/language/chaiscript_engine.hpp
+++ b/include/chaiscript/language/chaiscript_engine.hpp
@@ -8,8 +8,8 @@
 #include <fstream>
 
 
-#include "chaiscript_prelude.hpp"
-#include "chaiscript_parser.hpp"
+#include <chaiscript/language/chaiscript_prelude.hpp>
+#include <chaiscript/language/chaiscript_parser.hpp>
 
 namespace chaiscript
 {
diff --git a/src/main.cpp b/src/main.cpp
index d13fd58..0e70e00 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "chaiscript.hpp"
+#include <chaiscript/chaiscript.hpp>
 
 void print_help() {
     std::cout << "ChaiScript evaluator.  To evaluate and expression, type it and press <enter>." << std::endl;