Use filesystem::path instead of manual string tinkering