Rework Plugins

Cleaned up the history, and it's good to go soon as a new version of attributor makes CI happy.