Reorder command-query exercises