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

This reverts commit 51341db4b96422b891ea82ef785801d77e47c994.
Rebase from 'upstream'
Trimmed the branch to only the strands_base sub directory