Refactor Image directory