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

This reverts commit 9e25c36d0dd248cf16f5a45806741d581cd198c1.
Rebase from 'upstream'
Trimmed the branch to only the ps3joy sub directory