Fix class motion. Move only to module level class definition.