[WIP] Refactor path module