Refactoring, split of diagrams into different folders for easier additions of more diagram types