Refactor class structure (MotionProvider)