Added license and reorganised imports