Added namespacing to everything except networking