slightly changes
Merge remote-tracking branch 'origin/master'
change the structure of diagram bundle and name
it is a mess now
merge
mass is clean