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

This reverts commit c92d604bd9595b610169ba2d6ba003e82278555b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joy_map_saver sub directory