diff --git a/CMakeLists.txt b/CMakeLists.txt
index f279e5a3e..2da94d87a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,24 +56,26 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Target.cmake)
 ######################################################################################
 
 ## Paths to sources of modules
-set(  EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo"   CACHE INTERNAL "ParadisEO-EO   source directory" FORCE)
-set( EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo"  CACHE INTERNAL "ParadisEO-EDO  source directory" FORCE)
-set(  MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo"   CACHE INTERNAL "ParadisEO-MO   source directory" FORCE)
-set(MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo" CACHE INTERNAL "ParadisEO-MOEO source directory" FORCE)
-set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp"  CACHE INTERNAL "ParadisEO-SMP  source directory" FORCE)
-set( MPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eo/src/mpi"  CACHE INTERNAL "ParadisEO-MPI source directory" FORCE)
+set(      EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo"         CACHE INTERNAL "ParadisEO-EO       source directory" FORCE)
+set(     EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo"        CACHE INTERNAL "ParadisEO-EDO      source directory" FORCE)
+set(      MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo"         CACHE INTERNAL "ParadisEO-MO       source directory" FORCE)
+set(    MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo"       CACHE INTERNAL "ParadisEO-MOEO     source directory" FORCE)
+set(     SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp"        CACHE INTERNAL "ParadisEO-SMP      source directory" FORCE)
+set(     MPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eo/src/mpi" CACHE INTERNAL "ParadisEO-MPI      source directory" FORCE)
+set(EOSERIAL_SRC_DIR "${CMAKE_SOURCE_DIR}/eoserial"   CACHE INTERNAL "ParadisEO-EOSERIAL source directory" FORCE)
 
 set(PROBLEMS_SRC_DIR "${CMAKE_SOURCE_DIR}/problems" CACHE INTERNAL "Problems dependant source directory" FORCE)
-
+ 
 set(CMAKE_BASE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
 
 # All libraries are built in <build_dir>/lib/
-set(  EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO   binary directory" FORCE)
-set( EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO  binary directory" FORCE)
-set(  MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO   binary directory" FORCE)
-set(MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO binary directory" FORCE)
-set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP  binary directory" FORCE)
-set( MPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MPI  binary directory" FORCE)
+set(      EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO       binary directory" FORCE)
+set(     EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO      binary directory" FORCE)
+set(      MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO       binary directory" FORCE)
+set(    MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO     binary directory" FORCE)
+set(     SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP      binary directory" FORCE)
+set(     MPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MPI      binary directory" FORCE)
+set(EOSERIAL_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EOSERIAL binary directory" FORCE)
 
 
 set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules")
@@ -123,6 +125,13 @@ if(NOT EO_ONLY)
         include_directories(${MPI_INCLUDE_PATH})
         add_subdirectory(${MPI_SRC_DIR})
     endif()
+
+    ## EOSERIAL Module
+    #if(EOSERIAL)
+        set(EOSERIAL_MODULE_NAME "Serialization Module")
+        set(CMAKE_SOURCE_DIR ${EOSERIAL_SRC_DIR})
+        add_subdirectory(${EOSERIAL_SRC_DIR})
+    #endif()
 endif()
 
 ######################################################################################
diff --git a/eoserial/CMakeLists.txt b/eoserial/CMakeLists.txt
index e69de29bb..f596760a5 100644
--- a/eoserial/CMakeLists.txt
+++ b/eoserial/CMakeLists.txt
@@ -0,0 +1,6 @@
+######################################################################################
+### Include subdirectories
+######################################################################################
+
+#add_subdirectory(doc)
+add_subdirectory(src)
\ No newline at end of file