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

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