Moved Scheduler to Service