Separate Diagram API - extract primitives in separate files.
Move diagram related files into corresponding folder.
Fix path to an external image.