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

This reverts commit 387ee1fa5065c3cc5026354eaa363d5a8b22ebb8.
Rebase from 'upstream'
Trimmed the branch to only the euscollada sub directory