reorder / reorganise reset signals slightly