clean up and renaming classes

clean up and renaming classes