Move fields to their own module

Also rearrange the imports somewhat.