The evolution of non-spherical and non-stationary winds of massive stars