Adding CMake build system
Removing old build system
Fixing indentation
A bit more braces