Reorganize stubdata