updated class names and cleaned up code
some more changes...
new changes...