Added license headers and fixed import paths