Rearrange items to be more clear
Add MatPlotLib