M$ to simplify software licensing