Cleanup.
Move Runner into its own file.