Reordered json creation

Quickly changed json creation order so that you can override most
fields with the MDC should you choose.
Merge pull request #25 from stuart-warren/next

Reordered json creation