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

This reverts commit a7ddf27deca88b8585d30fdaa160ff7869855558.
Rebase from 'upstream'
Trimmed the branch to only the play_motion sub directory