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

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