Move weather classes to CFXWeather