UPDATE: Refactor directory usage