licensing refactoring