Migrate some code for less confusion
Add missing license comments