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

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