Moved evaluation into separate folder