Moved to CMake based build