Continue to move away from MPlugin, more class organization