Make Supplier be in the "right" spot.
Add the GWT support XML.