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

This reverts commit 3980415233ea67df91b8431b9b8b76a9ea427239.
Rebase from 'upstream'
Trimmed the branch to only the manipulation sub directory