[RDY] Refactor path module