move Player combo and judgment out of folders