Reorganized the content