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

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