License headers, renamings and more cleanup.