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

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