Changed license to apache-2 and fixed metadata