Move MotionX specifics into a class