Small re-ordering to better match codelab descriptions.
Updating export.js for readability and a bug fix.