Add copyright.
Remove '-extra-' from package name.