Modified IO classes.
Added files that didn't make the last commit since it wasn't tracked.