Fixed support for yearly archives and tidied Haskell codebase.