Added JAX-RS class field parameters.  Some code reorganization.