Moved eval parameters to sep file

And lots more!