Refactor structure.