Move Plugins to Commands