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

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