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

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