Untangle Monad.hs and GHCApi.hs and some other changes