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

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