Move to a new mash format to enable EmberJS