deleted stuff and renamed stuff