Little reorganization

Same as Calculator