Move to new plugin structure