Changed file structure to reflect new UML