diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 675b87cd15eed5db830e16d86d9b3eeb16f984b2..a2089b380b63059dc59b5fbe43d4e058e2af9f4e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,6 +28,20 @@ add_library(particle_swarm SHARED
 
 add_library(boost_unit_test SHARED tests/boost_test_lib_dummy.cpp)
 
+add_library(data_set SHARED DataSet/DataSet.cpp)
+target_link_libraries(data_set boost_serialization)
+
+############
+# EXAMPLES #
+############
+add_executable(test_cases main.cpp)
+target_link_libraries(test_cases neuron particle_swarm boost_serialization data_set)
+
+##############
+# UNIT TESTS #
+##############
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unit-tests)
+
 add_executable(neuron_test tests/neuron_test.cpp)
 target_link_libraries(neuron_test boost_unit_test neuron)
 
@@ -61,6 +75,5 @@ target_link_libraries(particle_swarm_test boost_unit_test neuron particle_swarm)
 add_executable(particle_test tests/Particle_test.cpp)
 target_link_libraries(particle_test boost_unit_test neuron particle_swarm)
 
-add_executable(test_cases main.cpp)
-target_link_libraries(test_cases neuron particle_swarm boost_serialization)
+