Refactor Directory