Full IO namespace refactor with fixes to build