change to new plugin structure