restructuration logic done,garaphic needs.
Merge branch 'master' of https://github.com/Polp0pAuL/igpeCimat