Reorg and first draft of simple calculator.