Refactor dirs