Last import reorg work for now.

Remaining issues (shell commands, IntrinsicsResolver API, import
testing) captured in issues.

Also (re?)added ability to take files to run off the command line.