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

This reverts commit 9ac5e905ed8fa93142e16e46eac3598e4cc4a196.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the joy sub directory