Refactored Calculation module layout.