[REFACTOR] Split keyframe partial and polish makemove