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

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