Add some JsonIgnore annotations. Move some annotations for better reading.