Windows: Moved a function out of class
Misc: Collapsed some namespace calls