Move back service from main services bundle