updated licence headers and optimized imports