Reorder struct fields to save some memory
Merge pull request #891 from sjinks/reorder-fields

[NFR] Reorder struct fields to save some memory