Reorganize so everything is within servlet.
Test specs for GVR validate against new schemas.