Rearranged UML slightly

Reorganized it to make it a little easier to read