rearranged and renamed files