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

This reverts commit 0ee48b4ef9571f5bf53b1ec39db93ad284817397.
Rebase from 'upstream'
Trimmed the branch to only the carrot_planner sub directory