Switched to CMake