Now using CMake and changed directory structure