Reorganize IO mapping in client