Moved to new packages
Added license