[Evgeny, Jason] binder refactoring
[Evgeny, Jason] bundles removed