Move classes to make more consistent