Eventbus now is build with gradle

Various optimization