Did some refactoring.

Weather is in it's own package now, and the control flow in main is
simpler.