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

This reverts commit 7cb170ba313ef49791e306c61af6c0e47d374231.
Rebase from 'upstream'
Trimmed the branch to only the scitos_touch sub directory