Bundle plugin-system in plugin-definition-system