Reorder class member for better memory usage/alignment.

Reorder class member for better memory usage/alignment. #124