change bundle api
new simpler api
change api continue
small refactoring and format
remove all bundles