Refactored viewer packages and UML updated..