- new plugin id
- tiny package refactoring