Update CV; includes re-arrangement of sections