use Plugin instead Bundle

- closes many issues )
Merging in new plugin interface.