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

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