Added license and fixed imports