Refactor the structure.