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

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