[Cleanup] moved deprecated classes
[XOR] got xor working