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

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