Revert "Trimmed the branch to only the scheduler sub directory"

This reverts commit 3a87c2d9e397ebfad72e89f9b8669ffc5e66bfa4.
Rebase from 'upstream'
Trimmed the branch to only the scheduler sub directory