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

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