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

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