Rearrange core io package