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

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