now with better file path mangling