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

This reverts commit d9371efd92bf32e21e3d41f9228c938df2e3d6e8.
Rebase from 'upstream'
Trimmed the branch to only the yujin_ocs sub directory