Remove declaration merging
Remove bundle, introduce plugin
Simplify definitions, refactor