Reorganize checkpoints