om: refactor licensing classes