Reordered names alphabetically
Reorganized forms to separate places