Scheduler refactor & config file revert
New defaults for new format