Move classes to suitable modules