Reorganize plugin.yml