Works with test data.

Test data was incorrect as months are 0 based (January is 0).
Created tabular version for easier testing.
Refactored out common code.
Folder per metric type