refactor weather
move stuff around