Move to match new plugin structure