Refactored RestructFcst