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

This reverts commit b3b392590ccee6e27d34a8aecfe5ffa67e130d97.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the routine_behaviours sub directory