move moments to a separate file