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

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