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

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