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

I don't think you need these changes, can you please remove them?