Remove some white spaces.
Correct CMakeLists.txt to the new folder structure.
Add missing files.
Add missing configuration file.