Change on Calculator and Welcome Class and add new Calc Bean.