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

This reverts commit b014028012ef161b5c7b247293d1ede10299d1bb.
Rebase from 'upstream'
Trimmed the branch to only the joy_map_saver sub directory