Move classes to separate classes