Refactor in include EvolComputation Stuff AIO