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

This reverts commit fc09c7a47e2c2dfbb80a05a3df5581a9bf93178d.
Rebase from 'upstream'
Trimmed the branch to only the joy_listener sub directory