Updated UML

Cleaned up the organization, added map diagram
A few more UML updates