Added updated uml

also removed incorrect previous classes