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

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