Move services to main Service.bundle