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

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