Premier refacto
Merge branch 'console-calculator' of https://github.com/francois-vanelslande/calculator into console-calculator