Joined fields and moved fields of models upwards.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>