Simplifying io/Read and rearranging include/core