Corrected copyright.
Removed class definitions that are now in separate components.