Refactoring diagram presenter
DiagramSource is now using DiagramType
Cleaning up ClassModule