Added changes from other PC - Scheduler, Changes to dir structure, changes to Form1, etc
merge update