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

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