TRUNK-3849: Move Address and Name layout support classes from web layer to api layer

Unless they were auto format changes that you didn't make