[feature] Adding support for emitter 2.0
[refactor] More refactoring for 2.0
[typo] removing test file