Added all new modules from the diagram project