Optimised Imports and updated Copyright to all classes