Improve metadata, change license to apache2