Refactoring + Licenses.