Moved all movements into movements class