Licensing and refactoring, (Code and UI)