Added copyright info + some further import cleanup.

Missed some files in the last PR...