resolve more licensing discrepancies, move to rst