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

This reverts commit b70013f96928221080d102b1110b6a4cdc16c6c3.
Rebase from 'upstream' @ version '0.2.2'
Trimmed the branch to only the yujin_ocs sub directory