reorganize, remove byteorder