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

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