IPlugin update.

Just some reorganizing.