Changed namespaces, no longer use separate space for the server