Fix score structure, generalize movement defs in generate_oly_score