Moving Criterion into utils dir