more cleanup and renaming of classes