devcommand-34 Refactor to plugin architecture