+ fix NPE
+ refactor packages
+ fix aggreation strategy for REST messages