Move all new code to new package; add copyright