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

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