Rearranged files to make sense