Rearranged the sections and corresponding files.