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

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