Clear up this module/plugin stuff. Now its plugin everywhere.