Updated Copyright in new classes.
Organised Imports.