remove and reorganize files