Moving to CMake build, changed folder structure