Renamed key files and switched a raw pointer to a unique_ptr