re-org codes

Separate the strategy part with the evaluation part