Reorganize evaluation and results