Re-organize the structure.