Move field related code into Fields.hs