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

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