Updated aeson version.
Refactoring the code into slightly neater modules.