New designs

Removed redundant classes and prepared a few new classes. Added the UML