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

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