added Server namespaces and updated include files