Reorganized the structure