Split into a minimal plug-in and an autoload module