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

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