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

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