Diagram: Predefined shapes moved to separate solution