Remove separation of webapi and ui