Re-arrangement of packages
Remove additional header comments in package-info s
Removal of license plug in