Complete rework to use only one android service