Reorganized some stuff

removed .txt files, and UPDATED UML