Started refactor to use Object Oriented Licenses.