Move classes

These were accidently modified in the wrong place