got rid of Moves class