Refactor things back into the PathLocation