Renamed files to be used with CMake