Copyright headers; some import reorgs