Moved DiagramBlock into its own file...