Improved support for class and component diagrams

• Improvements when detecting the PlantUML diagram type
• Better support for nested class and component diagrams
• bugfixes