Fixed UML and final changes to code organization
idk
merged master