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

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