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

This reverts commit 40be47aacdfe43416c2b870c23c222e939bf73c0.
Rebase from 'upstream'
Trimmed the branch to only the joy sub directory