traces/cupti/kepler: re-organize