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

This reverts commit 6f74aa67173bed49456ae803b08cd8283a9b3586.
Rebase from 'upstream'
Trimmed the branch to only the fiveam sub directory