discovery.yml and plugin definitions refactor