Adding Structure to the top level wrapper.
Minor nits.
Adding API parameters defs.