Ck 13329 delete namespacing

Removed all the namespacing and ServerFactory code. Also fixed some tests.