Removing some "slops"

Just re-ordering some field inside structures to avoid extra memory
required by memory-alignment.