rename and reorder file to maintain consistency