[DF-3732] WindSystem refactoring