reorganize and rename files