Moving functions into the class Move