Restructuring to allow the GWT app to be included in build