More refactoring to allow config or plugin to be installed separately.