Re-ordering exports
Re-generating all services with updated lens and export templating