Re-org how data gets compiled into JSON