Renamed plugin_runner to plugin to absolve confusion and fix up import complaints