Refactoring code. seperated Budget, calculators and structure for infrastructure breakout.