Broker position service out into separate bundle