Restructure to support common definitions for Forecast and Diagnosis