Re order exports, to include notes
Clean up exports