[Tim & Greg] Refactored Paths