diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dbee2b..71c5e7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 
 include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/include/")
+add_definitions( -std=c++0x )
 
 option(MultiCoreBSP "Building with Multi Core BSP" OFF)
 if(MultiCoreBSP)
@@ -13,7 +14,7 @@ else()
 	set(libs bsponmpi m)
 endif()
 
-find_package(Boost REQUIRED COMPONENTS program_options)
+find_package(Boost REQUIRED COMPONENTS program_options filesystem system)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 set(libs ${libs} ${Boost_LIBRARIES})
 
diff --git a/include/includes.hpp b/include/includes.hpp
new file mode 100644
index 0000000..e69de29
diff --git a/include/utilities.hpp b/include/utilities.hpp
new file mode 100644
index 0000000..e69de29
diff --git a/wavelet/CMakeLists.txt b/wavelet/CMakeLists.txt
index caf1670..7509a83 100644
--- a/wavelet/CMakeLists.txt
+++ b/wavelet/CMakeLists.txt
@@ -1,7 +1,12 @@
 file(GLOB sources *.cpp)
+file(GLOB headers *.hpp)
+
+find_package(PNG REQUIRED)
+include_directories(SYSTEM ${PNG_INCLUDE_DIRS})
+set(libs ${libs} ${PNG_LIBRARIES})
 
 foreach(source ${sources})
 	get_filename_component(exec ${source} NAME_WE)
-	add_executable(${exec} ${source})
+	add_executable(${exec} ${source} ${headers})
 	target_link_libraries(${exec} ${libs})
 endforeach()
diff --git a/wavelet/compressed_image.hpp b/wavelet/compressed_image.hpp
new file mode 100644
index 0000000..e69de29
diff --git a/wavelet/compressed_image_test.cpp b/wavelet/compressed_image_test.cpp
new file mode 100644
index 0000000..e69de29