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

This reverts commit 80e50f2aecc452ea32e78847db1b21e851d2411a.
Rebase from 'upstream'
Trimmed the branch to only the backtrack_behaviour sub directory