Updated UML and renamed/rearranged some things