Bump required GHC version
Code re-org