Separating files
Modelling main mode
Modelling calculator mode
Layering as original