Delete unused code in Main, shuffle functions across modules a bit.
Merge branch 'master' of github.com:misterbeebee/calisson-hs