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

This reverts commit 0403fcb3ccd2b7c4a33ca0617015959a12588baa.
Rebase from 'upstream'
Trimmed the branch to only the urdf sub directory