Refactoring merger of Mod.hs into Add.hs