Align licence and organization fields