Consolidate WebService

Status: up and running