Update copyright and licensing
Reorg imports