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

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