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

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