Move into core package.
Fix help message.