More moving of files into the IO module