refactor dirs structure