Move services to the right bundle