Reordering of file

Based on feedback from Nicki.