rename classes
remove old