diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34db90b..d449c23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,16 +6,13 @@ INCLUDE(cmake/eigen.cmake)
 INCLUDE(cmake/python.cmake)
 INCLUDE(cmake/test.cmake)
 
+SET(PROJECT_NAMESPACE stack-of-tasks)
 SET(PROJECT_NAME parametric-curves)
 SET(PROJECT_DESCRIPTION "Template based classes for creating and manipulating parametric curves. Comes with extra options specific to end-effector trajectories in robotics." )
-SET(PROJECT_URL "http://github.com/stack-of-tasks/parameteric-curves")
+SET(PROJECT_URL "http://github.com/${PROJECT_NAMESPACE}/${PROJECT_NAME}")
 
 SET(DOXYGEN_USE_MATHJAX yes)
-
-
-#set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/build/")
-#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/")
-#set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/lib/")
+SET(CUSTOM_HEADER_DIR ${PROJECT_NAME})
 
 # Disable -Werror on Unix for now.
 SET(CXX_DISABLE_WERROR True)
@@ -23,13 +20,6 @@ SET(CMAKE_VERBOSE_MAKEFILE True)
 
 SETUP_PROJECT()
 
-IF(WIN32)
-  SET(LINK copy_if_different)
-ELSE(WIN32)
-  SET(LINK create_symlink)
-ENDIF(WIN32)
-
-
 ADD_REQUIRED_DEPENDENCY("eigen3 >= 3.0.5")
 SET(BOOST_REQUIERED_COMPONENTS serialization)
 SET(BOOST_OPTIONAL_COMPONENTS "")
@@ -47,44 +37,13 @@ SEARCH_FOR_BOOST()
 SEARCH_FOR_EIGEN()
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 
-install(FILES
-  #	${CMAKE_SOURCE_DIR}/include/parametric-curves/bernstein.h
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/abstract-curve.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/MathDefs.h
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/spline.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/polynomial.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/infinite-sinusoid.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/infinite-const-acc.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/constant.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/linear-chirp.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/minimum-jerk.hpp
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/text-file.hpp
-  #	${CMAKE_SOURCE_DIR}/include/parametric-curves/bezier_curve.h
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/curve-constraint.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves
-  )
-
-install(FILES
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/eigen-matrix.hpp
-  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/serialization
-  )
-install(FILES
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/spatial/force-curve.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/spatial
-  )
-install(FILES
-  ${CMAKE_SOURCE_DIR}/include/parametric-curves/utils/file-io.hpp
-  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/utils
-  )
-
 IF(BUILD_PYTHON_INTERFACE)
   STRING(REGEX REPLACE "-" "_" PY_NAME ${PROJECT_NAME})
   SET(PYWRAP ${PY_NAME}_pywrap)
   ADD_SUBDIRECTORY(python)
 ENDIF(BUILD_PYTHON_INTERFACE)
 
+ADD_SUBDIRECTORY (include/${PROJECT_NAME})
 ADD_SUBDIRECTORY (src/tests/spline_test)
 
 ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
diff --git a/cmake b/cmake
index 8e7bedf..391e99b 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 8e7bedfcbd8524c0401a58fd74edc07c3d4308d0
+Subproject commit 391e99bea1a82a497a205e3ac8f83c1f6b8e1b78
diff --git a/include/parametric-curves/CMakeLists.txt b/include/parametric-curves/CMakeLists.txt
new file mode 100644
index 0000000..1ea03fa
--- /dev/null
+++ b/include/parametric-curves/CMakeLists.txt
@@ -0,0 +1,31 @@
+install(FILES
+  #	bernstein.h
+  abstract-curve.hpp
+  MathDefs.h
+  spline.hpp
+  polynomial.hpp
+  infinite-sinusoid.hpp
+  infinite-const-acc.hpp
+  constant.hpp
+  linear-chirp.hpp
+  minimum-jerk.hpp
+  text-file.hpp
+  #	bezier_curve.h
+  curve-constraint.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves
+  )
+
+install(FILES
+  serialization/eigen-matrix.hpp
+  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/serialization
+  )
+install(FILES
+  spatial/force-curve.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/spatial
+  )
+install(FILES
+  utils/file-io.hpp
+  #${CMAKE_SOURCE_DIR}/include/parametric-curves/serialization/archive.hpp
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/parametric-curves/utils
+  )