cleanup and additions

renamed 2 classes, addition of new classes