Moved files again and updated UML