Reorganized the structure.