make-jar cleanup
Updated to be services
Rxjava ext