MB-9128:  move web service over to "factory"

Change-Id: Ibb7c9ba80a4cf62b004db9963938cf1dde0b9423