Reorganized the file