Wrap to Plugin: refs #1464

change structure