CMake: Restructure configuration file
Merge pull request #382 from tamiko/restructure_file

CMake: Restructure configuration file