Misc license and structural changes