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

This reverts commit 643f2b6a3cef6756d9b76795da4d54ba3930f64d.
Rebase from 'upstream'
Trimmed the branch to only the smclib sub directory