More refactoring. Fixing LICENSE.