Re-ordering exports