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

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