re-adding Server and Cloud to top level namespace