Move classes in distinct files