updated class names, removed package