Split class diagram and component diagram. Fixes #35