Add component and deployment UML diagrams

Minor changes and fixes in other diagrams