Currently the different web services are somewhat intertwined. They should be cleanly separated in three services
