diff --git a/CMakeLists.txt b/CMakeLists.txt
index 501f4647..0cfec3ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,9 +8,9 @@ SET (CMAKE_BUILD_TYPE gdb)
 SET (CMAKE_C_FLAGS_GDB " -Wall -ggdb")
 SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb")
 
-include_directories(boxedcpp)
+include_directories(dispatchkit langkit)
 
 add_subdirectory(langkit bin)
-add_subdirectory(boxedcpp bin)
+add_subdirectory(dispatchkit bin)
 add_subdirectory(wesley bin)
- 
\ No newline at end of file
+ 
diff --git a/dispatchkit/dispatch_engine/CMakeLists.txt b/dispatch_engine/CMakeLists.txt
similarity index 100%
rename from dispatchkit/dispatch_engine/CMakeLists.txt
rename to dispatch_engine/CMakeLists.txt
diff --git a/dispatchkit/dispatch_engine/bootstrap.hpp b/dispatch_engine/bootstrap.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/bootstrap.hpp
rename to dispatch_engine/bootstrap.hpp
diff --git a/dispatchkit/dispatch_engine/bootstrap_stl.hpp b/dispatch_engine/bootstrap_stl.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/bootstrap_stl.hpp
rename to dispatch_engine/bootstrap_stl.hpp
diff --git a/dispatchkit/dispatch_engine/boxed_value.hpp b/dispatch_engine/boxed_value.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/boxed_value.hpp
rename to dispatch_engine/boxed_value.hpp
diff --git a/dispatchkit/dispatch_engine/boxedcpp.hpp b/dispatch_engine/boxedcpp.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/boxedcpp.hpp
rename to dispatch_engine/boxedcpp.hpp
diff --git a/dispatchkit/dispatch_engine/proxy_constructors.hpp b/dispatch_engine/proxy_constructors.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/proxy_constructors.hpp
rename to dispatch_engine/proxy_constructors.hpp
diff --git a/dispatchkit/dispatch_engine/proxy_functions.hpp b/dispatch_engine/proxy_functions.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/proxy_functions.hpp
rename to dispatch_engine/proxy_functions.hpp
diff --git a/dispatchkit/dispatch_engine/register_function.hpp b/dispatch_engine/register_function.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/register_function.hpp
rename to dispatch_engine/register_function.hpp
diff --git a/dispatchkit/dispatch_engine/test.cpp b/dispatch_engine/test.cpp
similarity index 100%
rename from dispatchkit/dispatch_engine/test.cpp
rename to dispatch_engine/test.cpp
diff --git a/dispatchkit/dispatch_engine/type_info.hpp b/dispatch_engine/type_info.hpp
similarity index 100%
rename from dispatchkit/dispatch_engine/type_info.hpp
rename to dispatch_engine/type_info.hpp
diff --git a/dispatchkit/dispatch_engine/unittest.cpp b/dispatch_engine/unittest.cpp
similarity index 100%
rename from dispatchkit/dispatch_engine/unittest.cpp
rename to dispatch_engine/unittest.cpp
diff --git a/wesley/CMakeLists.txt b/wesley/CMakeLists.txt
index 07ad8519..d7382c68 100644
--- a/wesley/CMakeLists.txt
+++ b/wesley/CMakeLists.txt
@@ -10,7 +10,7 @@ SET (CMAKE_CXX_FLAGS_GDB " -Wall -ggdb")
 find_package(Boost 1.36.0 COMPONENTS regex unit_test_framework)
 if(Boost_FOUND)
    include_directories(${Boost_INCLUDE_DIRS})
-   include_directories(../langkit ../boxedcpp)
+   include_directories(../langkit ../dispatchkit)
    
    add_executable(wesley_test main.cpp)