General Plugin Cleanups

Begin cleaning up all plugins to follow similar models/patterns.

Change-Id: I6dd31ade4de310a4db9487a628b20d25a133bb97