diff --git a/CMakeLists.txt b/CMakeLists.txt
index 196e61fc3dca89ec6b4353ec191ae596a4e0844a..f82b92fae22f30641a4cc6d9f63eead54c0de82e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-SET(PROJECT_NAME dynamicGraph)
+SET(PROJECT_NAME dynamic-graph)
 project(${PROJECT_NAME})
 
 # --- PROJECT VERSION -----------------------
@@ -16,6 +16,7 @@ SET(PROJECT_VERSION ${${PROJECT_NAME}_VERSION})
 
 SET(CMAKE_VERBOSE_MAKEFILE true)
 
+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
 # Get the OS
 SET(OS ${CMAKE_SYSTEM_NAME})
@@ -61,11 +62,6 @@ OPTION(BUILD_SHARED_LIBS "Build ${PROJECT_NAME} with shared libraries." ON)
 OPTION(GENERATE_DOC "Generate html documentation" OFF)
 
 OPTION(USE_BOOST "Compile with boost." ON)
-OPTION(USE_DYNAMICS_JRL_JAPAN "Compile with dynamicsJRLJapan" ON)
-
-# Release/Debug
-#SET(CMAKE_BUILD_TYPE RELEASE)
-#SET(CMAKE_BUILD_TYPE DEBUG)
 
 #
 # Look for dependencies
@@ -106,6 +102,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dynamic-graph.pc
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(unitTesting)
+
 #
 # Documentation produced by doxygen
 #
diff --git a/NEWS b/NEWS
index 2735499bde922721ddb896bc72ab7d8fac8120c3..02272d9c1de641e5c5675138cf91c6f3ffe84540 100644
--- a/NEWS
+++ b/NEWS
@@ -1 +1 @@
-Write in this file the news related to package dynamicGraph.
+Write in this file the news related to package dynamic-graph.
diff --git a/doc/additionalDoc/package.h b/doc/additionalDoc/package.h
index 8fc0fc622089109d6d7f2eaea0fef6d4b899e8d4..be875a22a84afe1c0dc4f32849c7e686798ff574 100644
--- a/doc/additionalDoc/package.h
+++ b/doc/additionalDoc/package.h
@@ -4,7 +4,7 @@
 \section intro_dynamicGraph Introduction
 
 This code implements the factory design pattern, making creation of entities
-available to packages depending on the dynamicGraph API.
+available to packages depending on the dynamic-graph API.
 
 Objects, which are derived from Entities, can be
  declared within the code and compiled to shared libraries (.so/.dll files).
@@ -42,7 +42,7 @@ corresponding headers in this module are:
 \ingroup dgraph
 @{
 
-Classes that make up the core of the dynamicGraph library are listed here.
+Classes that make up the core of the dynamic-graph library are listed here.
 @}
 \ingroup signals
 @{
diff --git a/doc/package.dox.cmake b/doc/package.dox.cmake
index a0c54ebf805b899726acc4a5f6f87dba9ad509dd..9d5cb9c293722e8f2c06ddea0867991829606d1c 100644
--- a/doc/package.dox.cmake
+++ b/doc/package.dox.cmake
@@ -162,7 +162,7 @@ TAGFILES               = \
 	${_dynamicsJRLJapan_DOCDIR}/html/dynamicsJRLJapan.doxytag=${_dynamicsJRLJapan_DOCDIR}/html \
 	${_hrp2Dynamics_DOCDIR}/html/hrp2Dynamics.doxytag=${_hrp2Dynamics_DOCDIR}/html \
 	${_walkGenJrl_DOCDIR}/html/walkGenJrl.doxytag=${_walkGenJrl_DOCDIR}/html
-GENERATE_TAGFILE       = dynamicGraph.doxytag
+GENERATE_TAGFILE       = dynamic-graph.doxytag
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index ef26edcaa4401fb521c5c3e584ca9317b1d028e3..0e940a527b62a183a6ad52dbfdb0fee2fd299d20 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,27 +1,38 @@
-# 
-#  Copyright 
-# 
-
-SET(${PROJECT_NAME}_HEADERS
-dynamicGraph-API.h
+### Get the headers paths
+SET(include_list "${CMAKE_CURRENT_SOURCE_DIR}/dynamic-graph-API.h")
+FILE(GLOB_RECURSE headers_list 
+	${PROJECT_SOURCE_DIR}/src/*.h
 )
+FILE(GLOB_RECURSE templates_list 
+	${PROJECT_SOURCE_DIR}/src/*.t.cpp
+)
+LIST(APPEND include_list ${headers_list})
+LIST(APPEND include_list ${templates_list})
 
-# Recreate correct path for the headers
-#--------------------------------------
-
-SET(fullpath_${PROJECT_NAME}_HEADERS)
-FOREACH(lHeader ${${PROJECT_NAME}_HEADERS})
-  SET(fullpath_${PROJECT_NAME}_HEADERS 
-    ${fullpath_${PROJECT_NAME}_HEADERS}
-    ./${lHeader}
-  )
+### Copy headers to include directories
+SET(HEADER_IN_INCLUDE_DIR "")
+FOREACH(header ${include_list})
+	GET_FILENAME_COMPONENT(headerName ${header} NAME)
+	
+	ADD_CUSTOM_COMMAND(
+	   OUTPUT  ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName}
+	   COMMAND ${CMAKE_COMMAND} -E copy ${header}
+	   		${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName}
+	)
+	
+	INSTALL(FILES
+	   ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName}
+	   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}
+	   PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
+  	
+  	SET(HEADER_IN_INCLUDE_DIR ${HEADER_IN_INCLUDE_DIR} 
+       ${${PROJECT_NAME}_BINARY_DIR}/include/${PROJECT_NAME}/${headerName})
+ENDFOREACH(header)
 
-ENDFOREACH(lHeader)
+### Create a top level rule to copy all the headers from src to include/dynamic-graph
+ADD_CUSTOM_TARGET(headers ALL
+		   DEPENDS ${HEADER_IN_INCLUDE_DIR})
 
-#----------------------------------------------------
-# Install procedure for the header files
-#----------------------------------------------------
-INSTALL(FILES ${fullpath_${PROJECT_NAME}_HEADERS}
-	DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}
-        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-)
+### Dependency of the main library on the headers
+ADD_DEPENDENCIES(${PROJECT_NAME}
+	headers)
diff --git a/include/dynamicGraph-API.h b/include/dynamicGraph-API.h
deleted file mode 100644
index cbdd64e7774e9a91b22a9c8c0c9c3e4cee491dfb..0000000000000000000000000000000000000000
--- a/include/dynamicGraph-API.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  Copyright
- */
-
-#ifndef DYNAMICGRAPH_API_H
-#define DYNAMICGRAPH_API_H
-
-#if defined (WIN32)
-#  ifdef DYNAMICGRAPH_EXPORT
-#    define DYNAMICGRAPH_EXPORT __declspec(dllexport)
-#  else
-#    define DYNAMICGRAPH_EXPORT __declspec(dllimport)
-#  endif
-#else
-#  define DYNAMICGRAPH_EXPORT
-#endif
-
-#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db3e05f132bfef1a513c5a8a725e447af855a42f..09f5d2a6083b1c026d9b0be8bb5bd5d119155227 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,318 +1,67 @@
-# 
-#  Copyright 
-# 
+####################################
+### Main Library
+####################################
+SET(LIBRARY_NAME ${PROJECT_NAME})
 
-# Create the library "dynamicGraph" 
-SET(libdg_src "")
-SET(libdg_headers "../include/dynamicGraph-API.h")
-SET(libdg_templates "")
-SET(libdg_plugins "")
-SET(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
-SET(LIBRARY_NAME dynamicGraph)
-
-#ordre est important
 INCLUDE_DIRECTORIES(
-${${PROJECT_NAME}_BINARY_DIR}/include
-${CMAKE_SOURCE_DIR}/include
+	${${PROJECT_NAME}_BINARY_DIR}/include
 )
 
 ADD_DEFINITIONS(-DDEBUG=2)
-
-# provide path to library libMatrixAbstractLayer.so
-LINK_DIRECTORIES(${_MatrixAbstractLayer_LIBRARY_DIRS})
-
-
-# provide path to library libdynamicsJRLJapan.so
-LINK_DIRECTORIES(${_dynamicsJRLJapan_LIBRARY_DIRS})
-
-
-# provide path to library libhrp2Dynamics.so
-LINK_DIRECTORIES(${_hrp2Dynamics_LIBRARY_DIRS})
-
-
-# provide path to library libwalkGenJrl.so
-LINK_DIRECTORIES(${_walkGenJrl_LIBRARY_DIRS})
-
-
-#############################################"
-
-MACRO(SOT_SRC_SUBDIR_PROCESS)
-  # Guess the .h names from .cpp names.
-  FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_src})
-     SET(newsrcfile "")
-     STRING(REGEX REPLACE "cpp$" "h" newsrcfile ${srcfile})
-     LIST(APPEND libdg_${SOT_MODULE_NAME}_headers ${newsrcfile})
-  ENDFOREACH(srcfile)
-  # Same for plugins.
-  FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_plugins_src})
-     SET(newsrcfile "")
-     STRING(REGEX REPLACE "cpp$" "h" newsrcfile ${srcfile})
-     LIST(APPEND libdg_${SOT_MODULE_NAME}_plugins_headers ${newsrcfile})
-  ENDFOREACH(srcfile)
+ADD_LIBRARY(${LIBRARY_NAME} 
+  SHARED
+  debug/debug.cpp
   
-  # Guess the .h names from .t.cpp template names.
-  SET(tempext "t\\.cpp")
-  FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_templates})
-     SET(newsrcfile "")
-     STRING(REGEX REPLACE "${tempext}$" "h" newsrcfile ${srcfile})
-     LIST(APPEND libdg_${SOT_MODULE_NAME}_headers ${newsrcfile})
-  ENDFOREACH(srcfile)
-  # Same for plugins.
-  FOREACH(srcfile ${libdg_${SOT_MODULE_NAME}_plugins_templates})
-     LIST(APPEND libdg_${SOT_MODULE_NAME}_plugins_headers ${srcfile})
-  ENDFOREACH(srcfile)
+  dgraph/entity.cpp
+  dgraph/factory.cpp
+  dgraph/interpreter.cpp
+  dgraph/plugin-loader.cpp
+  dgraph/pool.cpp
   
-  # Down to the previous level.
-  LIST(APPEND libdg_src ${libdg_${SOT_MODULE_NAME}_src})
-  LIST(APPEND libdg_headers ${libdg_${SOT_MODULE_NAME}_headers})
-  LIST(APPEND libdg_templates ${libdg_${SOT_MODULE_NAME}_templates})
-  LIST(APPEND libdg_plugins_src ${libdg_${SOT_MODULE_NAME}_plugins_src})
-  LIST(APPEND libdg_plugins_headers ${libdg_${SOT_MODULE_NAME}_plugins_headers})
-  LIST(APPEND libdg_plugins_templates ${libdg_${SOT_MODULE_NAME}_plugins_templates})
-ENDMACRO(SOT_SRC_SUBDIR_PROCESS)
-
-
-INCLUDE(debug/SourcesLib.cmake)
-INCLUDE(dgraph/SourcesLib.cmake)
-INCLUDE(signal/SourcesLib.cmake)
-INCLUDE(exception/SourcesLib.cmake)
-
-# -------------------------------------------------------------
-# --- HEADERS -------------------------------------------------
-# -------------------------------------------------------------
-# Create rule to copy all the headers form src to include/src
-# For each header we create a rule
-SET(HEADER_IN_INCLUDE_DIR "")
-SET(ADDED_SRC_DEPEND_PROPERTIES "")
-FOREACH (header ${libdg_headers} ${libdg_templates}) 
-  GET_FILENAME_COMPONENT(headerName ${header} NAME)
-  ADD_CUSTOM_COMMAND(
-   OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
-   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${header} 
-           ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
-   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${header}  
+  exception/exception-abstract.cpp
+  exception/exception-factory.cpp
+  exception/exception-signal.cpp
+  
+  signal/signal-array.cpp
   )
-  INSTALL(FILES
-	   ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName}
-	   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
-	   PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
-  SET(HEADER_IN_INCLUDE_DIR ${HEADER_IN_INCLUDE_DIR} 
-       ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${headerName})
-ENDFOREACH(header)
-
-# --- Create a top level rule to copy all the headers from src to include/dynamicGraph
-ADD_CUSTOM_TARGET(header ALL
-		   DEPENDS ${HEADER_IN_INCLUDE_DIR})
-
-# --- Dependencies of the dgraph library on the headers.
-ADD_LIBRARY(${LIBRARY_NAME} 
-  ${libdg_src} ${libdg_headers}
-)
-
-# Add MatrixAbstractLayer compilation flags and link to library libMatrixAbstractLayer.so
-ADD_DEFINITIONS(${_MatrixAbstractLayer_CFLAGS})
-IF(UNIX)
-TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_MatrixAbstractLayer_LIBRARIES})
-ENDIF(UNIX)
-
-IF(WIN32)
-foreach(dlink ${_MatrixAbstractLayer_LDFLAGS})
-	SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS}  ${dlink}")
-endforeach(dlink)
-ENDIF(WIN32)
-
-# Add dynamicsJRLJapan compilation flags and link to library libdynamicsJRLJapan.so
-ADD_DEFINITIONS(${_dynamicsJRLJapan_CFLAGS})
-IF(UNIX)
-TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_dynamicsJRLJapan_LIBRARIES})
-ENDIF(UNIX)
-
-IF(WIN32)
-foreach(dlink ${_dynamicsJRLJapan_LDFLAGS})
-	SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS}  ${dlink}")
-endforeach(dlink)
-ENDIF(WIN32)
-
-# Add hrp2Dynamics compilation flags and link to library libhrp2Dynamics.so
-ADD_DEFINITIONS(${_hrp2Dynamics_CFLAGS})
-IF(UNIX)
-TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_hrp2Dynamics_LIBRARIES})
-ENDIF(UNIX)
-
-IF(WIN32)
-foreach(dlink ${_hrp2Dynamics_LDFLAGS})
-	SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS}  ${dlink}")
-endforeach(dlink)
-ENDIF(WIN32)
-
-# Add walkGenJrl compilation flags and link to library libwalkGenJrl.so
-ADD_DEFINITIONS(${_walkGenJrl_CFLAGS})
-IF(UNIX)
-TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${_walkGenJrl_LIBRARIES})
-ENDIF(UNIX)
-
-IF(WIN32)
-foreach(dlink ${_walkGenJrl_LDFLAGS})
-	SET ( ${PROJECT_NAME}_src_LDFLAGS "${${PROJECT_NAME}_src_LDFLAGS}  ${dlink}")
-endforeach(dlink)
-ENDIF(WIN32)
-
-# -------------------------------------------------------------
-# --- LIBS ----------------------------------------------------
-# -------------------------------------------------------------
 
 SET_TARGET_PROPERTIES(${LIBRARY_NAME} 
   PROPERTIES 
   SOVERSION ${PROJECT_VERSION}
   INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 
-SET_TARGET_PROPERTIES(${LIBRARY_NAME} 
+SET_TARGET_PROPERTIES(${LIBRARY_NAME}
   PROPERTIES
-  COMPILE_FLAGS "${${PROJECT_NAME}_src_CXXFLAGS}"
   LINK_FLAGS "${${PROJECT_NAME}_src_LDFLAGS}"
 )
 
-# --- Force the creation of the headers before compiling the lib.
-ADD_DEPENDENCIES(${LIBRARY_NAME} header)
-
-# Install the main lib.
 INSTALL(TARGETS ${LIBRARY_NAME}
-   DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+ 
+####################################
+### Plugins
+####################################
+SET(plugins_list 
+	dgraph/shell-functions
+	dgraph/shell-procedure
+	debug/contiifstream
+)
 
+FOREACH(plugin_file ${plugins_list})
+GET_FILENAME_COMPONENT(plugin ${plugin_file} NAME)
+ADD_LIBRARY(${plugin}
+ SHARED
+ "${plugin_file}.cpp")
+ 
+TARGET_LINK_LIBRARIES(${plugin}
+	${PROJECT_NAME}) 
+ 
+SET_TARGET_PROPERTIES(${plugin}
+   PROPERTIES
+   COMPILE_FLAGS "${${PROJECT_NAME}_CXXFLAGS}"
+   PREFIX ""
+   LIBRARY_OUTPUT_DIRECTORY "${${PROJECT_NAME}_BINARY_DIR}/lib/plugin")
    
-# -------------------------------------------------------------
-# --- PLUGINS -------------------------------------------------
-# -------------------------------------------------------------
-
-# -------------------------------------------------------------------
-# --- UTILS ---------------------------------------------------------
-# -------------------------------------------------------------------
-MACRO(LIST2STRING _VAR_ARG _LIST_ARG)
-  SET(${_VAR_ARG})
-  SET(_FIRST_STEP 1)
-  FOREACH(_ITEM ${ARGV})
-     IF(_FIRST_STEP)
-	SET(_FIRST_STEP 0)
-     ELSE(_FIRST_STEP)
-           SET (${_VAR_ARG} "${${_VAR_ARG}} ${_ITEM}")
-     ENDIF(_FIRST_STEP)
-  ENDFOREACH(_ITEM)
-ENDMACRO(LIST2STRING)
-
-# Create rule to compile all the plugins form src to include/src.
-# For each plugin we create a rule.
-SET(PLUGINS_IN_LIBPATH "")
-SET(srcextension "\\.cpp")
-SET(srcheader "\\.h")
-SET(srctemplate "t\\.cpp")
-MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/lib/plugin")
-
-# --- PLUGIN HEADERs -----------------------------------------
-# Add the command that will copy the header of each plugin 
-#  in the include repository.
-FOREACH (plugin ${libdg_plugins_headers}) 
-  # Create the name of the library out of the name of the plugin.
-  GET_FILENAME_COMPONENT(pluginHeader ${plugin} NAME)
-  STRING(REGEX REPLACE "${srcheader}$" "" newsofile ${pluginHeader})
-  
-  # Add a command to copy the header.
-  ADD_CUSTOM_COMMAND(
-	OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
-	COMMAND ${CMAKE_COMMAND} -E copy 
-	${CMAKE_CURRENT_SOURCE_DIR}/${plugin} 
-	${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${plugin})
-
-  INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader}
-	   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
-	   PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
-  
-  # Create a top level rule to copy all the headers from src to include/dg
-  ADD_CUSTOM_TARGET(header_${newsofile} ALL
-	 DEPENDS ${${PROJECT_NAME}_BINARY_DIR}/include/dynamic-graph/${pluginHeader})
-ENDFOREACH(plugin)
-
-# --- PLUGIN TEMPLATEs -----------------------------------------
-# Add the command that will copy the header of each plugin 
-#  in the include repository.
-FOREACH (plugin ${libdg_plugins_templates}) 
-  # Create the name of the library out of the name of the plugin.
-  GET_FILENAME_COMPONENT(pluginTemplate ${plugin} NAME)
-  STRING(REGEX REPLACE "${srctemplate}$" "" newsofile ${pluginTemplate})
-  STRING(REGEX REPLACE ".${srctemplate}$" "" newsofile2 ${pluginTemplate})
-  SET(${newsofile2}Template ${plugin})
-
-  # Add a command to copy the header.
-  ADD_CUSTOM_COMMAND(
-	OUTPUT ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate}
-	COMMAND ${CMAKE_COMMAND} -E copy 
-	${CMAKE_CURRENT_SOURCE_DIR}/${plugin} 
-	${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate}
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${plugin})
-
-  INSTALL(FILES ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate}
-	   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/dynamic-graph
-	   PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
-  
-  # Create a top level rule to copy all the headers from src to include/dg
-  ADD_CUSTOM_TARGET(header_${newsofile} ALL
-	  	     DEPENDS ${${PROJECT_NAME}_BINARY_DIR}/include/dynamicGraph/${pluginTemplate})
-ENDFOREACH(plugin)
-
-# --- PLUGIN LINKS -------------------------------------------
-# Specific LD Flags for plugins.
-LIST(APPEND ${PROJECT_NAME}_PLUGIN_LDFLAGS ${${PROJECT_NAME}_LINK_SRC_FLAGS})
-
-# --- PLUGIN COMPILATION -----------------------------------------------
-FOREACH(plugin ${libdg_plugins_src}) 
-  # Create the name of the library out of the name of the plugin.
-  GET_FILENAME_COMPONENT(pluginName ${plugin} NAME)
-  STRING(REGEX REPLACE "${srcextension}$" "" newsofile ${pluginName})
-  STRING(REGEX REPLACE ${srcextension}$ .h pluginHeader ${plugin})
-
-  # Specify the new target.
-  SET(plugin_add_srcsname ${newsofile}_additional_srcs)
-  SET(pluginTemplate ${newsofile}Template)
-
-  ADD_LIBRARY(${newsofile} ${plugin} ${pluginHeader} ${${pluginTemplate}} ${${plugin_add_srcsname}})
-  SET_TARGET_PROPERTIES(${newsofile} PROPERTIES
-                         COMPILE_FLAGS "${${PROJECT_NAME}_CXXFLAGS}"
-                         PREFIX ""
-  			 LIBRARY_OUTPUT_DIRECTORY "${${PROJECT_NAME}_BINARY_DIR}/lib/plugin")
-
-  # Make sure that this plugin depends upon the other specified dependencies.
-  SET(newsofile_plugins_dependencies  ${${newsofile}_plugins_dependencies})
-  SET(newsofile_plugins_compile_flags ${${newsofile}_plugins_compile_flags})
-  SET(newsofile_plugins_link_flags    ${${newsofile}_plugins_link_flags})
-  
-  SET(localtarget_dependencies ${LIBRARY_NAME}    ${newsofile_plugins_dependencies})
-  SET(local_plugins_compile    ${${PROJECT_NAME}_CXX_FLAGS}      ${newsofile_plugins_compile_flags})
-  SET(local_plugins_link_flags ${${PROJECT_NAME}_PLUGIN_LDFLAGS} ${newsofile_plugins_link_flags} )
-	  
-  # Make sure that this plugin is depend upon the global dependancies.
-  foreach (dependencyOrder ${localtarget_dependencies})
-		ADD_DEPENDENCIES(${newsofile} ${dependencyOrder})
-  endforeach (dependencyOrder)
-
-  link_directories(${LIBRARY_OUTPUT_PATH})
-  target_link_libraries(${newsofile} ${LIBRARY_NAME})
-
-  foreach (extraDependency ${newsofile_plugins_dependencies})
-    # Add the flags of the sub plugins.
-    LIST(APPEND local_plugins_compile ${${extraDependency}_plugins_compile_flags})
-    target_link_libraries(${newsofile} ${extraDependency})
-  endforeach (extraDependency)
-
-
-  
-  LIST2STRING(_cf "${local_plugins_compile}")
-  LIST2STRING(_lf "${local_plugins_link_flags}")
-  SET_TARGET_PROPERTIES(${newsofile} PROPERTIES 
-   	 		 COMPILE_FLAGS "${_cf} ${${PROJECT_NAME}_CXXFLAGS}"
-         LINK_FLAGS "${_lf}")
-  INSTALL(TARGETS ${newsofile} 
-	   DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/plugin
-  	   PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
-  ADD_DEPENDENCIES(${newsofile} header_${newsofile})
-ENDFOREACH(plugin)
+INSTALL(TARGETS ${plugin}
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/plugin)
+ENDFOREACH(plugin)
\ No newline at end of file
diff --git a/src/debug/SourcesLib.cmake b/src/debug/SourcesLib.cmake
deleted file mode 100644
index a9f9ca20d0bcb4f7f8e1fed39c5db6f6c22e4fab..0000000000000000000000000000000000000000
--- a/src/debug/SourcesLib.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# ---------------------------------------------------------------
-# --- SOURCE FILE NAMES -----------------------------------------
-# ---------------------------------------------------------------
-SET(SOT_MODULE_NAME debug)
-
-# --- Add your Source Files here.
-SET(libdg_${SOT_MODULE_NAME}_src
-      debug/debug.cpp
-)
-SET(libdg_${SOT_MODULE_NAME}_plugins_src 
-      debug/contiifstream.cpp
-)
-
-# ---------------------------------------------------------------
-# --- GENERIC RULES ---------------------------------------------
-# ---------------------------------------------------------------
-SOT_SRC_SUBDIR_PROCESS()
diff --git a/src/debug/debug.h b/src/debug/debug.h
index bd6892381580d7a24c83816ba50d76799fd11ac7..664f5cc89b9b5f9fbe5e0901228be786f65b3f30 100644
--- a/src/debug/debug.h
+++ b/src/debug/debug.h
@@ -42,7 +42,7 @@
 #include <fstream>
 #include <sstream>
 #include <stdarg.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
  
 /* -------------------------------------------------------------------------- */
diff --git a/src/dgraph/SourcesLib.cmake b/src/dgraph/SourcesLib.cmake
deleted file mode 100644
index 98c496ade80285ebeb18a2a02a601e5d8c0a7b50..0000000000000000000000000000000000000000
--- a/src/dgraph/SourcesLib.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-# ---------------------------------------------------------------
-# --- SOURCE FILE NAMES -----------------------------------------
-# ---------------------------------------------------------------
-SET(SOT_MODULE_NAME dgraph)
-
-# --- Add your Source Files here.
-SET(libdg_${SOT_MODULE_NAME}_src
-      dgraph/pool.cpp
-      dgraph/interpreter.cpp
-      dgraph/factory.cpp
-      dgraph/entity.cpp
-      dgraph/plugin-loader.cpp  
-)
-
-SET(libdg_${SOT_MODULE_NAME}_templates "")
-SET(libdg_${SOT_MODULE_NAME}_headers "")
-
-SET(libdg_${SOT_MODULE_NAME}_plugins_headers "")
-SET(libdg_${SOT_MODULE_NAME}_plugins_templates "")
-SET(libdg_${SOT_MODULE_NAME}_plugins_src 
-      dgraph/shell-functions.cpp
-      dgraph/shell-procedure.cpp
-)
-
-# Specify the compile flags for source file.
-SET_SOURCE_FILES_PROPERTIES(${SOT_MODULE_NAME}/shell-functions.cpp 
-			    ${SOT_MODULE_NAME}/shell-procedure.cpp
-        		    PROPERTIES 	 
-			    COMPILE_FLAGS "${MatrixAbstractLayer_cflags}" )
-
-# ---------------------------------------------------------------
-# --- GENERIC RULES ---------------------------------------------
-# ---------------------------------------------------------------
-SOT_SRC_SUBDIR_PROCESS()
diff --git a/src/dgraph/entity.h b/src/dgraph/entity.h
index 6bd4150e52248978dfa4dcb2cedbaea8e475b453..94662255f499cf458547de45e9912dfd58660d18 100644
--- a/src/dgraph/entity.h
+++ b/src/dgraph/entity.h
@@ -30,7 +30,7 @@
 #include <dynamic-graph/signal-base.h>
 #include <dynamic-graph/exception-factory.h>
 #include <dynamic-graph/signal-array.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 /* --- STD --- */
 #include <string>
diff --git a/src/dgraph/factory.h b/src/dgraph/factory.h
index ec2724b41921904e8a80aef16be9eb55292e7e9f..20b88e6c915b604835e9fe6fdbfc1c8ef658b81f 100644
--- a/src/dgraph/factory.h
+++ b/src/dgraph/factory.h
@@ -32,7 +32,7 @@
 
 /* --- SOT --- */
 #include <dynamic-graph/exception-factory.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 namespace dynamicgraph {
 
diff --git a/src/dgraph/interpreter.h b/src/dgraph/interpreter.h
index 5cbd96895d5b9c226a6f55ceef49e20fbee4e4e6..f305d995876a711e0df896388e621824818ec07e 100644
--- a/src/dgraph/interpreter.h
+++ b/src/dgraph/interpreter.h
@@ -30,7 +30,7 @@
 #include <dynamic-graph/signal-base.h>
 #include <dynamic-graph/exception-factory.h>
 #include <dynamic-graph/pool.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 /* --- STD --- */
 #include <string>
diff --git a/src/dgraph/plugin-loader.h b/src/dgraph/plugin-loader.h
index 1d670dd42a90a1e2b9845baea8c7a4848cb38f42..da01ec25866e80f28cc8822ed45a1837aac99210 100644
--- a/src/dgraph/plugin-loader.h
+++ b/src/dgraph/plugin-loader.h
@@ -33,7 +33,7 @@
 
 /* --- SOT --- */
 #include <dynamic-graph/exception-factory.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 namespace dynamicgraph {
 
diff --git a/src/dgraph/pool.h b/src/dgraph/pool.h
index 82f56283e52afbd375a0321803d710fc5a979b25..50543be56859a0c536513b738e3c7219e03f934f 100644
--- a/src/dgraph/pool.h
+++ b/src/dgraph/pool.h
@@ -32,7 +32,7 @@
 /* --- SOT --- */
 #include <dynamic-graph/exception-factory.h>
 #include <dynamic-graph/signal-base.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 namespace dynamicgraph
 {
diff --git a/src/exception/SourcesLib.cmake b/src/exception/SourcesLib.cmake
deleted file mode 100644
index d920494f4bb2837248e87252bf0131f814cc2ced..0000000000000000000000000000000000000000
--- a/src/exception/SourcesLib.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-# ---------------------------------------------------------------
-# --- SOURCE FILE NAMES -----------------------------------------
-# ---------------------------------------------------------------
-SET(SOT_MODULE_NAME exception)
-
-# --- Add your Source Files here.
-SET(libdg_${SOT_MODULE_NAME}_src 
-      exception/exception-abstract.cpp 
-      exception/exception-factory.cpp  
-      exception/exception-signal.cpp 
-)
-
-SET (libdg_${SOT_MODULE_NAME}_templates "")
-SET(libdg_${SOT_MODULE_NAME}_headers "")
-
-# ---------------------------------------------------------------
-# --- GENERIC RULES ---------------------------------------------
-# ---------------------------------------------------------------
-SOT_SRC_SUBDIR_PROCESS()
diff --git a/src/exception/exception-abstract.h b/src/exception/exception-abstract.h
index 601f694093b42d543a1a243ecb1e0b29f6b14e71..d3e96117798af9f992bd1e642a2d962d2c024db6 100644
--- a/src/exception/exception-abstract.h
+++ b/src/exception/exception-abstract.h
@@ -29,7 +29,7 @@
 /* Classes standards. */
 #include <iostream>                /* Classe ostream.    */
 #include <string>                  /* Classe string.     */
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 
 // Uncomment this macros to have lines parameter on the throw display
diff --git a/src/exception/exception-factory.h b/src/exception/exception-factory.h
index db7cd37122e464455f3f3be33cab796e651bd531..71cfbfce8c0c322c661d0b8c3e73794a7c6a32bb 100644
--- a/src/exception/exception-factory.h
+++ b/src/exception/exception-factory.h
@@ -27,7 +27,7 @@
 
 
 #include <dynamic-graph/exception-abstract.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 /* --------------------------------------------------------------------- */
 /* --- CLASS ----------------------------------------------------------- */
diff --git a/src/exception/exception-signal.h b/src/exception/exception-signal.h
index eab4f79b6e67830754336a7e82a5f6202c8e6b3d..5fc6368d49d531c359ba1161437d285b1e43db8b 100644
--- a/src/exception/exception-signal.h
+++ b/src/exception/exception-signal.h
@@ -27,7 +27,7 @@
 
 
 #include <dynamic-graph/exception-abstract.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 /* --------------------------------------------------------------------- */
 /* --- CLASS ----------------------------------------------------------- */
diff --git a/src/signal/SourcesLib.cmake b/src/signal/SourcesLib.cmake
deleted file mode 100644
index 9e38207eab44049687f92e339149149a3e39bb62..0000000000000000000000000000000000000000
--- a/src/signal/SourcesLib.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# ---------------------------------------------------------------
-# --- SOURCE FILE NAMES -----------------------------------------
-# ---------------------------------------------------------------
-SET(SOT_MODULE_NAME signal)
-
-# --- Add your Source Files here.
-SET (libdg_${SOT_MODULE_NAME}_src
-      signal/signal-array.cpp
-)
-
-SET (libdg_${SOT_MODULE_NAME}_templates 
-      signal/signal.t.cpp 
-      signal/time-dependency.t.cpp 
-      signal/signal-ptr.t.cpp
-)
-
-SET(libdg_${SOT_MODULE_NAME}_headers 
-     signal/signal-base.h
-     signal/signal-time-dependant.h
-)
-
-# Add specific compilation rules.
-
-# ---------------------------------------------------------------
-# --- GENERIC RULES ---------------------------------------------
-# ---------------------------------------------------------------
-SOT_SRC_SUBDIR_PROCESS()
diff --git a/src/signal/signal-array.h b/src/signal/signal-array.h
index 4a860df34e7fd3ff704ba4691b276577e3bf5724..dd34fa589891bbb34461204405ba69eaee438719 100644
--- a/src/signal/signal-array.h
+++ b/src/signal/signal-array.h
@@ -24,7 +24,7 @@
 #define __SIGNAL_ARRAY_HH
 
 #include <dynamic-graph/signal-base.h>
-#include <dynamic-graph/dynamicGraph-API.h>
+#include <dynamic-graph/dynamic-graph-API.h>
 
 namespace dynamicgraph {
 
diff --git a/unitTesting/CMakeLists.txt b/unitTesting/CMakeLists.txt
index 86ad0df1ec617833ae5084b163237729585bf3c6..116aebba3a57edbf79dba2a04aba36248b31858c 100644
--- a/unitTesting/CMakeLists.txt
+++ b/unitTesting/CMakeLists.txt
@@ -2,6 +2,7 @@
 #  Copyright 
 # 
 
+### test_shell
 SET(EXECUTABLE_NAME test_shell)
 
 ADD_DEFINITIONS(-DDEBUG=2)
@@ -9,26 +10,28 @@ ADD_DEFINITIONS(-DDEBUG=2)
 ADD_EXECUTABLE(${EXECUTABLE_NAME}
   test_shell.cpp)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(
+	${${PROJECT_NAME}_BINARY_DIR}/include
+)
+
+LINK_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/lib)
 
-link_directories(${LIBRARY_OUTPUT_PATH})
 TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
-  dynamicGraph
+  ${PROJECT_NAME}
   dl)
 
 
-#NOTE on test_factory:
-# test can only be compiled IF sotGainAdaptive has been compiled first
-SET(EXECUTABLE_NAME test_factory)
+### test_factory
+# test currently disabled
+#SET(EXECUTABLE_NAME test_factory)
 
-ADD_DEFINITIONS(-DDEBUG=2)
+#ADD_DEFINITIONS(-DDEBUG=2)
 
-ADD_EXECUTABLE(${EXECUTABLE_NAME}
-  test_factory.cpp)
+#ADD_EXECUTABLE(${EXECUTABLE_NAME}
+#  test_factory.cpp)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-
-link_directories(${LIBRARY_OUTPUT_PATH})
-TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
-  dynamicGraph
-  dl)
\ No newline at end of file
+#INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+#link_directories(${LIBRARY_OUTPUT_PATH})
+#TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME}
+#  ${PROJECT_NAME}
+#  dl)
\ No newline at end of file