rename classes and tests
delete old classes