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

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