Structural Change in Investment and Consumption – A Unified Analysis