[DF-861] refactoring(exclude android)

tested in win and mac os, not tested for android