extra defined removed, files renamed