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

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