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

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