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

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