[DF-3732] Refactoring WindComponet