Fixed Scheduler, moved main files for computation