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

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