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

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