Revert "Merge a parte logica com os graficos"

This reverts commit f5ff6fe196fb52342e656262607e034bf1688860.