rename reorder exercises
updates to exercises
finish merge