rearanged and renamed files