Revert "Move some plugins around"

This reverts commit acf77ebd115851767adb8cc38c462815eea6701e.