Updated to new plugin structure

New